.profile, .shellrc: use dircolors

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index 38c547e2c67b7c009be3083f807fb48ba4ff80ff..e189ac8523855e69b85a786f84b1d2c1c16fb277 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -6,6 +6,17 @@ OPS1="$OPS1\\$"
 PS1="$OPS1 "
 
 
+case "$HOME" in
+   /home/*)
+      if [ -L /home ]; then
+         START_DIR="`pwd`" &&
+         cd "$HOME" &&
+         HOME="`pwd`" &&
+         cd "$START_DIR"
+      fi
+   ;;
+esac
+
 case "$SHELL" in
 */bash)
    [ "`type -t ls`" = alias ] && unalias ls
@@ -47,7 +58,7 @@ case "$SHELL" in
    for cmd in builtin cgmem_nice command dbus-launch exec \
       killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg su sudo \
       time whence whereis which xargs; do
-         ! has_completion $cmd && complete -A command -o default $cmd
+         ! has_completion $cmd && complete -o default -A command $cmd
    done
 
    for cmd in dig host nslookup nc netcat nmap p ping ping6 socat \
@@ -59,7 +70,7 @@ case "$SHELL" in
 
    for cmd in distribute ftp lftp r rsync \
       s scp ssh smbclient tcpdump tshark wireshark; do
-         ! has_completion $cmd && complete -A hostname -o default $cmd;
+         ! has_completion $cmd && complete -o default -A hostname $cmd;
    done
 
    complete -A job bg fg j jobs wait
@@ -111,6 +122,10 @@ x() { exit; }
 X() { startx >> .Xserver.log 2>&1; cyr; }
 
 
+git() {
+   LESS=FRSX"$LESS" command git "$@"
+}
+
 include()
 {
    cfg="$1"
@@ -126,6 +141,12 @@ include()
 }
 
 
+grep() { command grep --color=auto "$@"; }
+fgrep() { command fgrep --color=auto "$@"; }
+egrep() { command egrep --color=auto "$@"; }
+ls() { command ls --color=auto "$@"; }
+
+
 mc() {
    if [ -n "$SLOWTERM" ]; then
       MC_SLOW="--slow"
@@ -193,18 +214,27 @@ mc() {
 }
 
 
+mkcd() {
+   if [ $# -ne 1 ]; then
+      echo "Usage: mkcd directory_name" >&2
+   elif [ -d "$1" ]; then
+      cd "$1"
+   elif [ -e "$1" ]; then
+      echo "Error: $1 is a file" >&2
+   else
+      mkdir -p "$1" && cd "$1"
+   fi
+}
+
+
 tmux() {
    case "$TERM" in
       rxvt)
-         TMUX_SAVE_TERM="$TERM"
-         TERM=rxvt-unicode
+         TERM=rxvt-unicode command tmux "$@"
       ;;
-   esac
 
-   command tmux "$@"
-   rc=$?
-
-   [ -n "$TMUX_SAVE_TERM" ] && TERM="$TMUX_SAVE_TERM"
-   unset TMUX_SAVE_TERM
-   return $rc
+      *)
+         command tmux "$@"
+      ;;
+   esac
 }