X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=8adc256b252b15555dfcd0c60ababafd72511d6a;hb=3db0fedaf633d333a03a923e6361346542839642;hp=e189ac8523855e69b85a786f84b1d2c1c16fb277;hpb=84e68b1fc87491881b3262b05347cdd871b1a119;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index e189ac8..8adc256 100644
--- a/.shellrc
+++ b/.shellrc
@@ -2,8 +2,40 @@
 # $HOME/.shellrc
 #
 
-OPS1="$OPS1\\$"
-PS1="$OPS1 "
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+
+#if [ -x /usr/bin/dircolors ]; then
+   # I don't like these aliases - they work only in command line
+   # but not in scripts I run from command line.
+   # Color parameters must be passed via environment.
+   #alias ls='ls --color=auto'
+   #alias dir='dir --color=auto'
+   #alias vdir='vdir --color=auto'
+
+   #alias grep='grep --color=auto'
+   #alias fgrep='fgrep --color=auto'
+   #alias egrep='egrep --color=auto'
+#fi
 
 
 case "$HOME" in
@@ -17,6 +49,11 @@ case "$HOME" in
    ;;
 esac
 
+
+OPS1="$OPS1\\$"
+PS1="$OPS1 "
+
+
 case "$SHELL" in
 */bash)
    [ "`type -t ls`" = alias ] && unalias ls
@@ -72,6 +109,7 @@ case "$SHELL" in
       s scp ssh smbclient tcpdump tshark wireshark; do
          ! has_completion $cmd && complete -o default -A hostname $cmd;
    done
+   unset has_completion
 
    complete -A job bg fg j jobs wait
    complete -A variable unset
@@ -80,6 +118,8 @@ case "$SHELL" in
       complete -W "`cd \"$HOME/lib/config\" && echo *`" include
    fi
    complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser
+
+   which pip >/dev/null 2>&1 && eval "`pip completion --bash`"
    ;;
 
 */ksh)
@@ -95,7 +135,7 @@ esac
 
 
 # clear history, clear screen and logout
-#chlo() { cd; unset HISTFILE; rm -f .*history*; clo; }
+#chlo() { cd; unset HISTFILE; rm -f .sh_history; history -c; clo; }
 
 
 #Pwd() { pwd | sed "s/.*\/\(.*\)\/\(.*\)\/\(.*\)\/\(.*\)/...\/\2\/\3\/\4/"; }
@@ -122,10 +162,6 @@ x() { exit; }
 X() { startx >> .Xserver.log 2>&1; cyr; }
 
 
-git() {
-   LESS=FRSX"$LESS" command git "$@"
-}
-
 include()
 {
    cfg="$1"
@@ -141,13 +177,14 @@ include()
 }
 
 
-grep() { command grep --color=auto "$@"; }
-fgrep() { command fgrep --color=auto "$@"; }
-egrep() { command egrep --color=auto "$@"; }
-ls() { command ls --color=auto "$@"; }
-
-
 mc() {
+   case "$SHELL" in
+      */bash)
+         MC_SAVE_OPS1="$OPS1"
+         OPS1="\u@\h "
+      ;;
+   esac
+
    if [ -n "$SLOWTERM" ]; then
       MC_SLOW="--slow"
    fi
@@ -208,8 +245,11 @@ mc() {
       rc=1
    fi
 
+   [ -n "$MC_SAVE_OPS1" ] && OPS1="$MC_SAVE_OPS1"
    [ -n "$MC_SAVE_TERM" ] && TERM="$MC_SAVE_TERM"
-   unset MC_FOUND MC_PWD_FILE MC_SAVE_TERM MC_SLOW MC_TMP_DIR MC_XTERM
+   unset MC_FOUND MC_PWD_FILE MC_SAVE_OPS1 MC_SAVE_TERM \
+         MC_SLOW MC_TMP_DIR MC_XTERM
+
    return $rc
 }
 
@@ -238,3 +278,12 @@ tmux() {
       ;;
    esac
 }
+
+
+if [ -f /usr/local/bin/virtualenvwrapper_lazy.sh ]; then
+   source /usr/local/bin/virtualenvwrapper_lazy.sh
+fi
+
+if which pyenv >/dev/null 2>&1; then
+   eval "`pyenv init -`"
+fi