X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=76f81950b8375407bed0f521105612c16102653f;hb=05cfb307e205fea010f32eda0c3944ffc40b6775;hp=e47cda2abd976cfa13f98fccf3705c1146a585c8;hpb=86c6f81d3b7c0b192549c1b285262597c100b22e;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index e47cda2..76f8195 100644
--- a/.shellrc
+++ b/.shellrc
@@ -2,6 +2,42 @@
 # $HOME/.shellrc
 #
 
+# ~/.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
+
+
 OPS1="$OPS1\\$"
 PS1="$OPS1 "
 
@@ -72,6 +108,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 +117,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 +134,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/"; }
@@ -137,20 +176,14 @@ include()
 }
 
 
-function mkcd {
-   if [ $# -ne 1 ]; then
-      echo "Usage: mkcd directory_name" >&2
-   elif [ -d "$1" ]; then
-      cd "$1"
-   elif [ -e "$1" ]; then
-      echo "Error: $1 is a file" >&2
-   else
-      mkdir -p "$1" && cd "$1"
-   fi
-}
-
-
 mc() {
+   case "$SHELL" in
+      */bash)
+         MC_SAVE_OPS1="$OPS1"
+         OPS1="\u@\h "
+      ;;
+   esac
+
    if [ -n "$SLOWTERM" ]; then
       MC_SLOW="--slow"
    fi
@@ -211,12 +244,28 @@ 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
 }
 
 
+mkcd() {
+   if [ $# -ne 1 ]; then
+      echo "Usage: mkcd directory_name" >&2
+   elif [ -d "$1" ]; then
+      cd "$1"
+   elif [ -e "$1" ]; then
+      echo "Error: $1 is a file" >&2
+   else
+      mkdir -p "$1" && cd "$1"
+   fi
+}
+
+
 tmux() {
    case "$TERM" in
       rxvt)