cros-board: update

[home.git] / .profile.d / aliases.sh

diff --git a/.profile.d/aliases.sh b/.profile.d/aliases.sh
index 103b795174f19fd1d4c7020d0a45ad50779d221b..6c3a9b12837e38d047792f1eb4bbebed5397dac0 100644 (file)
--- a/.profile.d/aliases.sh
+++ b/.profile.d/aliases.sh
@@ -27,10 +27,14 @@ alias quake4='quake4 +set s_driver oss'
 alias rrsync='rsync -Hav --inplace --progress'
 alias s='aspell -a'
 sss() { aspell -a <<<"$*"; }
-smplayer() { sudo -u smriti sh -c 'export DISPLAY=:0; xset s reset; exec mplayer "$@" >/dev/null 2>&1' sh "$@" ; }
-svlc() { sudo -u smriti sh -c 'export DISPLAY=:0; xset s reset; exec vlc "$@" >/dev/null 2>&1' sh "$@" ; }
-svnc() { sudo -u smriti sh -c 'export DISPLAY=:0; xset s reset; exec x11vnc -q -nopw' ; }
-alias trc=transmission-remote-cli
+sdisp() { sudo -u smriti sh -c 'export DISPLAY=:0; xset s reset; exec "$0" "$@"' "$@" ; }
+smplayer() { sdisp mplayer "$@" ; }
+smpv() { sdisp mpv "$@" ; }
+svlc() { sdisp vlc "$@" ; }
+svnc() { sdisp x11vnc -q -nopw ; }
+sweb() { sdisp google-chrome-beta "$@" ; }
+sxdg() { sdisp xdg-open "$@" ; }
+alias trc=tremc
 alias xine='xine -l'
 
 alias wol-vapier='wakeonlan -i 192.168.1.255 00:25:22:64:19:79; wakeonlan -i 192.168.0.255 00:25:22:64:19:79'
@@ -101,8 +105,34 @@ cd_history() {
                        ;;
                esac
        fi
+
        if command cd "$@" ; then
                pushd -n "${PWD}" >/dev/null
+       else
+               local ret=$?
+
+               if [[ $# -gt 1 ]] ; then
+                       # The `cd` above should have shown an error message for us.
+                       local arg first_arg="$1"
+                       while [[ $# -gt 0 ]] ; do
+                               arg="$1"
+                               shift
+                               if [[ -d ${arg} ]] ; then
+                                       if [[ $# -gt 0 ]] ; then
+                                               printf 'cd: remaining: %s\n' "$@" >&2
+                                       fi
+                                       printf 'cd: entering: %s\n' "${arg}" >&2
+                                       cd_history "${arg}"
+                                       return
+                               else
+                                       printf 'cd: skipping: %s\n' "${arg}" >&2
+                               fi
+                       done
+                       # If we're still here, then we didn't cd anywhere.
+                       echo "cd: cwd is unchanged!" >&2
+               fi
+
+               return ${ret}
        fi
 }
 alias cd='cd_history'