.shellrc: instead of colorized aliases create shell scripts

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index 035f756e4c4ce6302c7f41a484e4136af50cefe6..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
 
 
@@ -121,10 +124,10 @@ if test -n "$BASH_VERSION"; then
    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
 
 elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
    back() { cd - ${1:+"$@"}; }
@@ -171,12 +174,12 @@ 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
-      unset remote
    }
 
    # completion for cdremote - list remotes with directories as URLs
@@ -316,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; }