.shellrc: Move bash-only code to `.bashrc`

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index 3e238bd5546ca21863eae260caee660686c47598..e3a0ac7a01c1931230de2926692c7c45ced715fe 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -44,16 +44,6 @@ if test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
     j() { jobs; }
 fi
 
-if test -n "$BASH_VERSION"; then
-    if [ -r "$HOME"/admin/prog/bash_prompt ]; then
-        . "$HOME"/admin/prog/bash_prompt
-        set_prompt
-        unset set_prompt
-    else
-        PS1="${debian_chroot:+($debian_chroot)}\u@\h:\W \$SHLVL\\$ "
-    fi
-fi
-
 # clear screen and history, logout
 chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; }
 
@@ -168,13 +158,13 @@ fi
 vim() {
     command vim "$@"
     rc=$?
-    cd "`cat \"$HOME/tmp/vim/cwd\"`" && rm "$HOME/tmp/vim/cwd" &&
+    cd "`cat \"$HOME/tmp/vim/cwd\"`" && /bin/rm "$HOME/tmp/vim/cwd" &&
     return $rc
 }
 
 
 if [ "$SHLVL" -eq 1 ] && which startx >/dev/null 2>&1; then
-    X() { startx >> .Xserver.log 2>&1; cyr; rm -f .Xauthority; }
+    X() { startx >> .Xserver.log 2>&1; cyr; /bin/rm -f .Xauthority; }
 fi
 
 x() { exit; }