X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=6a57008952d125a312c4c012a75875286fa09699;hb=ae5f816b7ca05c64e19430dd58626afd04293d57;hp=e6ae4205771cbd7de715a179cee54d4c6cb984a7;hpb=6d8fcbe56b488f473406ef26c0c7a3cc2a4f0ce1;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index e6ae420..6a57008 100644
--- a/.shellrc
+++ b/.shellrc
@@ -2,8 +2,43 @@
 # $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
+
+# Stop if non-interactive shell
+# [ -z "$PS1" ] && return
+
+# 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 +52,11 @@ case "$HOME" in
    ;;
 esac
 
+
+OPS1="$OPS1\\$"
+PS1="$OPS1 "
+
+
 case "$SHELL" in
 */bash)
    [ "`type -t ls`" = alias ] && unalias ls
@@ -72,6 +112,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 +121,11 @@ case "$SHELL" in
       complete -W "`cd \"$HOME/lib/config\" && echo *`" include
    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
    ;;
 
 */ksh)
@@ -95,7 +141,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/"; }
@@ -118,12 +164,53 @@ KillAll() {
 }
 
 
-x() { exit; }
-X() { startx >> .Xserver.log 2>&1; cyr; }
+# git-related
+
+# chdir to a remote's directory (if the remote is on the local FS)
+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
 
 
-include()
-{
+include() {
    cfg="$1"
    if [ -f "./$cfg" -a -r "./$cfg" ]; then
       echo "Reading config file \`$cfg'" 1>&2
@@ -137,12 +224,14 @@ include()
 }
 
 
-function git {
-   LESS=FRSX"$LESS" command git "$@"
-}
-
-
 mc() {
+   case "$SHELL" in
+      */bash)
+         MC_SAVE_OPS1="$OPS1"
+         OPS1="\u@\h "
+      ;;
+   esac
+
    if [ -n "$SLOWTERM" ]; then
       MC_SLOW="--slow"
    fi
@@ -203,13 +292,16 @@ 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
 }
 
 
-function mkcd {
+mkcd() {
    if [ $# -ne 1 ]; then
       echo "Usage: mkcd directory_name" >&2
    elif [ -d "$1" ]; then
@@ -233,3 +325,17 @@ 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 -`"
+#   eval "`pyenv virtualenv-init -`"
+#fi
+
+
+X() { startx >> .Xserver.log 2>&1; cyr; }
+x() { exit; }