X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.shellrc;h=aef34517a6a4f9b6bba036f0479f3a5a5fe47f01;hp=a78a8e1efabecf156f72581d30dbfc8105d18143;hb=41c57a5fd1cf36e9115e8904c068b5777a49ba3e;hpb=d1ce1fba9bc3162e3d8d8fce7faff687aebbfcc2

diff --git a/.shellrc b/.shellrc
index a78a8e1..aef3451 100644
--- a/.shellrc
+++ b/.shellrc
@@ -58,7 +58,13 @@ case "$HOME" in
 esac
 
 
-OPS1="$OPS1\\$"
+# Remove trainling \$s
+OPS1="`echo $OPS1 | sed 's/[ \\$]\+$//'`"
+# Add a trainling space
+OPS1="$OPS1 "
+# Re-add trainling \$
+for ((i=0; i<$SHLVL; i++)); do OPS1="$OPS1\\$"; done
+
 PS1="$OPS1 "
 
 
@@ -74,7 +80,7 @@ if test -n "$BASH_VERSION"; then
    has_completion() { return 0; }
    if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
       if [ "$SHELL" = /bin/bash ]; then
-         if [ -d /usr/share/bash-completion ]; then
+         if [ -d /usr/share/bash-completion -a -f /usr/share/bash-completion/bash_completion ]; then
             . /usr/share/bash-completion/bash_completion
             has_completion() { [ -r /usr/share/bash-completion/completions/$1 ]; }
          elif [ -f /etc/bash_completion ]; then
@@ -98,12 +104,6 @@ if test -n "$BASH_VERSION"; then
       fi
    fi
 
-   if [ -d "$HOME"/.bash_completion.d ]; then
-      for _compf in "$HOME"/.bash_completion.d/*; do
-         . $_compf
-      done
-   fi
-
    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
@@ -122,6 +122,12 @@ if test -n "$BASH_VERSION"; then
          ! has_completion $cmd && complete -o default -A hostname $cmd
    done
 
+   if [ -d "$HOME"/.bash_completion.d ]; then
+      for _compf in "$HOME"/.bash_completion.d/*; do
+         . $_compf
+      done
+   fi
+
    delegate_completion() {
       local prog programs
       prog=$1
@@ -164,7 +170,7 @@ if test -n "$BASH_VERSION"; then
    #   eval "`pyenv virtualenv-init -`"
    #fi
 
-   source virtualenvwrapper_lazy.sh 2>/dev/null
+   . virtualenvwrapper_lazy.sh 2>/dev/null
 
    if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; then
       . "$VIRTUAL_ENV/bin/activate"
@@ -221,7 +227,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       fi
 
       if [ -n "$remote" ] && git config --get remote.$remote.url |
-            grep -q '^\(file:/\|/\|\.\./\)'; then
+            grep -q '^\(file:/\|/\|\.\./\)'; then # (file:/ or / or ../ at the beginning)
          cdgitpath remote.$remote.url
       else
 
@@ -231,14 +237,20 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
             return 1
          fi
 
-         _list_remotes '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
-         if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
-            remote=${GIT_REMOTES[0]}
-            unset GIT_REMOTES
-            cdgitpath remote.$remote.url
+         if test -n "$BASH_VERSION"; then
+            _list_remotes '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
+            if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
+               remote=${GIT_REMOTES[0]}
+               unset GIT_REMOTES
+               cdgitpath remote.$remote.url
+            else
+               unset GIT_REMOTES
+               echo "Cannot find directory for any remote" >&2
+               echo "Usage: cdremote [remote_name]" >&2
+               return 1
+            fi
          else
-            unset GIT_REMOTES
-            echo "Cannot find directory for any remote" >&2
+            echo "Cannot find directory for remote $1" >&2
             echo "Usage: cdremote [remote_name]" >&2
             return 1
          fi
@@ -332,7 +344,7 @@ include() {
 mc() {
    if test -n "$BASH_VERSION"; then
       MC_SAVE_OPS1="$OPS1"
-      OPS1="\u@\h "
+      OPS1="\u@\h \W "
    fi
 
    if [ -n "$SLOWTERM" ]; then