X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=7ad7ad9478e4f4968af21507aa94110e6525e85a;hb=b7ebc8162d5d8d4cbb9bd3a17e63d531e0f09548;hp=02d91a96aa10c1817fad542c32a466acf05167a3;hpb=20935750e8b5bb36a3f51eb3ef54c97d2d26aaf5;p=grml-etc-core.git

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 02d91a9..7ad7ad9 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -860,7 +860,7 @@ abk=(
     'co'   './configure && make && sudo make install'
 )
 
-globalias() {
+zleiab() {
     emulate -L zsh
     setopt extendedglob
     local MATCH
@@ -875,8 +875,8 @@ globalias() {
     LBUFFER+=${abk[$MATCH]:-$MATCH}
 }
 
-zle -N globalias
-bindkey ",." globalias
+zle -N zleiab
+bindkey ",." zleiab
 
 # autoloading
 zrcautoload zmv    # who needs mmv or rename?
@@ -1582,26 +1582,6 @@ if [[ -r /etc/debian_version ]] ; then
     #a3# Execute \kbd{grep-excuses}
     alias ge='grep-excuses'
 
-    # debian upgrade
-    #f3# Execute \kbd{apt-get update \&\& }\\&\quad \kbd{apt-get dist-upgrade}
-    upgrade() {
-        emulate -L zsh
-        if [[ -z $1 ]] ; then
-            $SUDO apt-get update
-            $SUDO apt-get -u upgrade
-        else
-            ssh $1 $SUDO apt-get update
-            # ask before the upgrade
-            local dummy
-            ssh $1 $SUDO apt-get --no-act upgrade
-            echo -n 'Process the upgrade?'
-            read -q dummy
-            if [[ $dummy == "y" ]] ; then
-                ssh $1 $SUDO apt-get -u upgrade --yes
-            fi
-        fi
-    }
-
     # get a root shell as normal user in live-cd mode:
     if isgrmlcd && [[ $UID -ne 0 ]] ; then
        alias su="sudo su"
@@ -1634,14 +1614,6 @@ EOMESS
     fi
 fi
 
-# get_tw_cli has been renamed into get_3ware
-if check_com -c get_3ware ; then
-    get_tw_cli() {
-        echo 'Warning: get_tw_cli has been renamed into get_3ware. Invoking get_3ware for you.'>&2
-        get_3ware
-    }
-fi
-
 # Use hard limits, except for a smaller stack and no core dumps
 unlimit
 is425 && limit stack 8192
@@ -2177,19 +2149,6 @@ deswap() {
     print 'Finished, running "swapoff -a; swapon -a" may also be useful.'
 }
 
-# spawn a minimally set up mksh - useful if you want to umount /usr/.
-minimal-shell() {
-    emulate -L zsh
-    local shell="/bin/mksh"
-
-    if [[ ! -x ${shell} ]]; then
-        printf '`%s'\'' not available, giving up.\n' ${shell} >&2
-        return 1
-    fi
-
-    exec env -i ENV="/etc/minimal-shellrc" HOME="$HOME" TERM="$TERM" ${shell}
-}
-
 # a wrapper for vim, that deals with title setting
 #   VIM_OPTIONS
 #       set this array to a set of options to vim you always want
@@ -2406,9 +2365,10 @@ cd() {
 }
 
 #f5# Create Directoy and \kbd{cd} to it
-mcd() {
+mkcd() {
     mkdir -p "$@" && cd "$@"
 }
+
 #f5# Create temporary directory and \kbd{cd} to it
 cdt() {
     local t
@@ -2451,22 +2411,6 @@ inplaceMkDirs() {
 #k# mkdir -p <dir> from string under cursor or marked area
 zle -N inplaceMkDirs && bindkey '^XM' inplaceMkDirs
 
-# Function Usage: doc packagename
-#f5# \kbd{cd} to /usr/share/doc/\textit{package}
-doc() {
-    emulate -L zsh
-    cd /usr/share/doc/$1 && ls
-}
-_doc() { _files -W /usr/share/doc -/ }
-check_com compdef && compdef _doc doc
-
-#f5# Make screenshot
-sshot() {
-    [[ ! -d ~/shots  ]] && mkdir ~/shots
-    #cd ~/shots ; sleep 5 ; import -window root -depth 8 -quality 80 `date "+%Y-%m-%d--%H:%M:%S"`.png
-    cd ~/shots ; sleep 5; import -window root shot_`date --iso-8601=m`.jpg
-}
-
 #f5# List files which have been accessed within the last {\it n} days, {\it n} defaults to 1
 accessed() {
     emulate -L zsh
@@ -2490,8 +2434,6 @@ check_com new || alias new=modified
 # use colors when GNU grep with color-support
 #a2# Execute \kbd{grep -{}-color=auto}
 (grep --help 2>/dev/null |grep -- --color) >/dev/null && alias grep='grep --color=auto'
-#a2# Execute \kbd{grep -i -{}-color=auto}
-alias GREP='grep -i --color=auto'
 
 # Translate DE<=>EN
 # 'translate' looks up fot a word in a file with language-to-language
@@ -2734,11 +2676,6 @@ allulimit() {
     ulimit -t unlimited
 }
 
-# highlight important stuff in diff output, usage example: hg diff | hidiff
-#m# a2 hidiff \kbd{histring} oneliner for diffs
-check_com -c histring && \
-    alias hidiff="histring -fE '^Comparing files .*|^diff .*' | histring -c yellow -fE '^\-.*' | histring -c green -fE '^\+.*'"
-
 #f5# Change the xterm title from within GNU-screen
 xtrename() {
     emulate -L zsh