Merge branch 'master' of github.com:10sr/dotfiles

bashrc

@@ -187,7 +187,8 @@ null type pacmatic && {
 null type apt-get && \
     alias aupgrade="sudo apt-get autoremove --yes && sudo apt-get update --yes && sudo apt-get upgrade --yes"
 null type port && \
-    alias pupgrade="sudo port -v selfupdate && sudo port -v upgrade outdated && sudo port -v uninstall leaves"
+    alias port="port -v"
+    alias pupgrade="sudo port -v selfupdate && { sudo port -v upgrade outdated; sudo port -v uninstall leaves; }"
 
 if iscygwin; then
     null type windate || alias windate="/c/Windows/System32/cmd.exe //c 'echo %DATE%-%TIME%'"
@@ -214,27 +215,31 @@ netwait(){
 cd(){
     if test $# -eq 0
     then
-        pushd ~/
+        pushd ~/ >/dev/null
+    elif ! test -d "$1"
+    then
+        echo `basename ${SHELL}`: cd: "$1": No such file or directory  2>&1
+        return 1
     elif test $1 = -
     then
         local pwd="$PWD"
         popd >/dev/null
-        pushd -n "$pwd"         # stack last dir
+        pushd -n "$pwd" >/dev/null        # stack last dir
     else
-        pushd "$@"
+        pushd "$1" >/dev/null
     fi
 }
 
-# pushd(){
-#     local pwd="$PWD"
-#     for l in $(\dirs -v -l | \grep "^ [0-9]\+  ${pwd}$" | cut -d " " -f 2 | tac)
-#     do
-#         echo $l
-#         test $l -eq 0 && continue
-#         popd +$l -n
-#     done
-#     command pushd "$@" >/dev/null
-# }
+pushd(){
+    local next="$(realpath "$1")"
+    for l in $(\dirs -v -l | \grep "^ [0-9]\+ *${next}$" | cut -d " " -f 2 | tac)
+    do
+        echo $l
+        test $l -eq 0 && continue
+        popd +$l -n
+    done
+    command pushd "$1" >/dev/null
+}
 
 input(){
     local foo
@@ -386,6 +391,7 @@ open_file(){
         open "$@"
     elif islinux
     then
+        touch "$@"
         if null type pcmanfm; then
             LC_MESSAGES= pcmanfm "$@"
         else

tmux.conf

@@ -20,9 +20,9 @@ set message-fg yellow
 set -g set-titles on
 
 set -g status-bg green
-set -g status-fg black
+set -g status-fg white
 if "test `hostname` = arch-aspireone" "set -g status-bg blue"
 if "test `hostname` = darwin-mba.local" "set -g status-bg yellow; set -g status-fg black"
-if "test `hostname` = newkiwi" "set -g status-bg magenta"
+if "test `hostname` = newkiwi" "set -g status-bg magenta; set -g status-fg white"
 
 if "test -f /opt/local/bin/reattach-to-user-namespace" "set-option -g default-command '/opt/local/bin/reattach-to-user-namespace bash'"