.shellrc: instead of colorized aliases create shell scripts

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index 38f7381a7b060becb2a9ceb9b5e6237fa1dca174..8389dd9f1c2cf552b4f23bcc9ac64a3e793c91f7 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -28,16 +28,19 @@ shopt -s checkwinsize
 
 
 #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'
+#   # 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.
+#   # So instead I put them in shell scripts in ~/bin.
+#   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'
+#
+#   alias dmesg='dmesg --human'
 #fi
 
 
@@ -57,8 +60,7 @@ OPS1="$OPS1\\$"
 PS1="$OPS1 "
 
 
-case "$SHELL" in
-*/bash)
+if test -n "$BASH_VERSION"; then
    [ "`type -t ls`" = alias ] && unalias ls
    [ "`type -t ll`" = alias ] && unalias ll
    [ "`type -t mc`" = alias ] && unalias mc
@@ -122,22 +124,19 @@ case "$SHELL" in
    fi
    complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser
 
-   if which pip >/dev/null 2>&1; then
-      eval "`pip completion --bash`"
-      rm -rf /tmp/pip_build_"$USER"
-   fi
-   ;;
+   #if type -p pip >/dev/null 2>&1; then
+   #   eval "`pip completion --bash`"
+   #   rm -rf /tmp/pip_build_"$USER"
+   #fi
 
-*/ksh)
+elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
    back() { cd - ${1:+"$@"}; }
    clo() { clear; exit; }
    j() { jobs; }
-   ;;
 
-*/sh)
+else
    clo() { clear; exit; }
-   ;;
-esac
+fi
 
 
 # clear history, clear screen and logout
@@ -171,47 +170,41 @@ cdremote() {
    cd "`git config --get remote.$1.url`"
 }
 
-case "$SHELL" in
-   */bash)
-      # list remotes with URLs matching a regexp
-      list_remotes() {
-         GIT_REMOTES=""
-         for remote in `git remote`; do
-            if git config --get remote.$remote.url | grep -q "$1"; then
-               GIT_REMOTES="$GIT_REMOTES $remote"
-            fi
-         done
-         remote=""
-         unset remote
-      }
-
-      # define completion for cdremote - list remotes with directories as URLs
-      _cdremote_complete() {
-         local cur="${COMP_WORDS[COMP_CWORD]}";
-         list_remotes '^/'
-         COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
-         GIT_REMOTES=""
-         unset GIT_REMOTES
-      }
-
-      complete -F _cdremote_complete cdremote
-
-      # define completion for git-open - list remotes with http(s) URLs
-      _git_open() {
-         local cur="${COMP_WORDS[COMP_CWORD]}";
-         list_remotes '^http\(s\)\?://'
-         COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
-         GIT_REMOTES=""
-         unset GIT_REMOTES
-      }
-
-      complete -F _git_open git-open
-   ;;
-esac
+if test -n "$BASH_VERSION"; then
+   # list remotes with URLs matching a regexp
+   list_remotes() {
+      GIT_REMOTES=""
+      local remote
+      for remote in `git remote`; do
+         if git config --get remote.$remote.url | grep -q "$1"; then
+            GIT_REMOTES="$GIT_REMOTES $remote"
+         fi
+      done
+   }
+
+   # completion for cdremote - list remotes with directories as URLs
+   _cdremote_complete() {
+      local cur="${COMP_WORDS[COMP_CWORD]}";
+      list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
+      COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
+      unset GIT_REMOTES
+   }
+
+   complete -F _cdremote_complete cdremote
+
+   # completion for git-open - list remotes with http(s) URLs
+   _git_open() {
+      local cur="${COMP_WORDS[COMP_CWORD]}";
+      list_remotes '^http\(s\)\?://'
+      COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
+      unset GIT_REMOTES
+   }
+
+   complete -F _git_open git-open
+fi
 
 
-include()
-{
+include() {
    cfg="$1"
    if [ -f "./$cfg" -a -r "./$cfg" ]; then
       echo "Reading config file \`$cfg'" 1>&2
@@ -226,12 +219,10 @@ include()
 
 
 mc() {
-   case "$SHELL" in
-      */bash)
-         MC_SAVE_OPS1="$OPS1"
-         OPS1="\u@\h "
-      ;;
-   esac
+   if test -n "$BASH_VERSION"; then
+      MC_SAVE_OPS1="$OPS1"
+      OPS1="\u@\h "
+   fi
 
    if [ -n "$SLOWTERM" ]; then
       MC_SLOW="--slow"
@@ -328,15 +319,15 @@ tmux() {
 }
 
 
-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 -`"
 #   eval "`pyenv virtualenv-init -`"
 #fi
 
+if [ -f /usr/local/bin/virtualenvwrapper_lazy.sh ]; then
+   source /usr/local/bin/virtualenvwrapper_lazy.sh
+fi
+
 
 X() { startx >> .Xserver.log 2>&1; cyr; }
 x() { exit; }