diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-12 19:12:40 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-12 19:12:40 -0400 |
commit | 8ff950d098146bc929504b062bcc6ccd5a2cb6ed (patch) | |
tree | e5d73cf1997b28bbaa24a693f5d8c2abb45be313 /.config/bash/aliases.sh | |
parent | 9d689e7d224b5c1ea3ab3018998135979f19c5a9 (diff) | |
parent | b0cdbb3da2c2b36d3c65b00db4eaf5a0d29c2cd6 (diff) |
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts:
.config/bash/rc.sh
.config/login.sh
.config/ssh/config
.config/wmii/include.sh
Diffstat (limited to '.config/bash/aliases.sh')
-rw-r--r-- | .config/bash/aliases.sh | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/.config/bash/aliases.sh b/.config/bash/aliases.sh index 0964a83..aabd073 100644 --- a/.config/bash/aliases.sh +++ b/.config/bash/aliases.sh @@ -6,23 +6,23 @@ # Set up colors and settings for ls/dir/vdir # ###################################################################### if [ -x "`which dircolors`" ]; then - eval "`dircolors -b`" - alias ls='ls -1v --color=auto' - alias dir='dir -v --color=auto' - alias vdir='vdir -v--color=auto' + eval "`dircolors -b`" + alias ls='ls -1v --color=auto' + alias dir='dir -v --color=auto' + alias vdir='vdir -v--color=auto' - for xgrep in ${PATH//:/\/*grep }/*grep; do - if [ -f "$xgrep" ]; then - xgrep=`basename "$xgrep"` - if [ "$xgrep" != pgrep ]; then - alias $xgrep="$xgrep --color=auto" - fi - fi - done + for xgrep in ${PATH//:/\/*grep }/*grep; do + if [ -f "$xgrep" ]; then + xgrep=`basename "$xgrep"` + if [ "$xgrep" != pgrep ]; then + alias $xgrep="$xgrep --color=auto" + fi + fi + done else - alias ls='ls -1v' - alias dir='dir -v' - alias vdir='vdir -v' + alias ls='ls -1v' + alias dir='dir -v' + alias vdir='vdir -v' fi ###################################################################### @@ -36,7 +36,6 @@ alias l='ls -CF' # Some preferences for miscellaneous stuff # ###################################################################### #alias rm='gvfs-trash' -alias ssh='ssh -XC' #alias sed='sed --follow-symlinks' # breaks sed 4.2.2 alias tree='tree --charset utf8' alias cd=pushd |