X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=f66bebc6db20ccb39bbc42f28ffafd8944c911b6;hb=bd49c00f9a18f413cd33767f5dfa793e9803c112;hp=14923e72b36539bbb26ed55cfe3dac5bf757ffac;hpb=cd79c201bb20c367fa87563d6cf0ff36a9fee1d7;p=grml-etc-core.git

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 14923e7..f66bebc 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -198,6 +198,10 @@ isopenbsd(){
     [[ $GRML_OSTYPE == "OpenBSD" ]]
 }
 
+issolaris(){
+    [[ $GRML_OSTYPE == "SunOS" ]]
+}
+
 #f1# are we running within an utf environment?
 isutfenv() {
     case "$LANG $CHARSET $LANGUAGE" in
@@ -354,12 +358,12 @@ ZSH_NO_DEFAULT_LOCALE=${ZSH_NO_DEFAULT_LOCALE:-0}
 typeset -ga ls_options
 typeset -ga grep_options
 if ls --color=auto / >/dev/null 2>&1; then
-    ls_options=( --color=auto )
+    ls_options+=( --color=auto )
 elif ls -G / >/dev/null 2>&1; then
-    ls_options=( -G )
+    ls_options+=( -G )
 fi
 if grep --color=auto -q "a" <<< "a" >/dev/null 2>&1; then
-    grep_options=( --color=auto )
+    grep_options+=( --color=auto )
 fi
 
 # utility functions
@@ -764,14 +768,17 @@ grmlcomp() {
 
     # host completion
     if is42 ; then
+        [[ -r ~/.ssh/config ]] && _ssh_config_hosts=(${${${(@M)${(f)"$(<$HOME/.ssh/config)"}:#Host *}#Host }:#*[*?]*}) || _ssh_config_hosts=()
         [[ -r ~/.ssh/known_hosts ]] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
         [[ -r /etc/hosts ]] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
     else
+        _ssh_config_hosts=()
         _ssh_hosts=()
         _etc_hosts=()
     fi
     hosts=(
         $(hostname)
+        "$_ssh_config_hosts[@]"
         "$_ssh_hosts[@]"
         "$_etc_hosts[@]"
         localhost
@@ -783,7 +790,7 @@ grmlcomp() {
     # use generic completion system for programs not yet defined; (_gnu_generic works
     # with commands that provide a --help option with "standard" gnu-like output.)
     for compcom in cp deborphan df feh fetchipac gpasswd head hnb ipacsum mv \
-                   pal stow tail uname ; do
+                   pal stow uname ; do
         [[ -z ${_comps[$compcom]} ]] && compdef _gnu_generic ${compcom}
     done; unset compcom
 
@@ -2586,7 +2593,7 @@ if [[ -r /etc/debian_version ]] ; then
     # get a root shell as normal user in live-cd mode:
     if isgrmlcd && [[ $UID -ne 0 ]] ; then
        alias su="sudo su"
-     fi
+    fi
 
     #a1# Take a look at the syslog: \kbd{\$PAGER /var/log/syslog}
     salias llog="$PAGER /var/log/syslog"     # take a look at the syslog
@@ -3020,29 +3027,37 @@ fi
 bk() {
     emulate -L zsh
     local current_date=$(date -u "+%Y-%m-%dT%H:%M:%SZ")
-    local keep move verbose result
+    local clean keep move verbose result all
+    setopt extended_glob
     usage() {
         cat << EOT
 bk [-hcmv] FILE [FILE ...]
+bk -r [-av] [FILE [FILE ...]]
 Backup a file or folder in place and append the timestamp
+Remove backups of a file or folder, or all backups in the current directory
 
 Usage:
 -h    Display this help text
 -c    Keep the file/folder as is, create a copy backup using cp(1) (default)
 -m    Move the file/folder, using mv(1)
+-r    Remove backups of the specified file or directory, using rm(1). If none
+      is provided, remove all backups in the current directory.
+-a    Remove all (even hidden) backups.
 -v    Verbose
 
-The -c and -m options can't be used at the same time. If both specified, the
-last one is used.
+The -c, -r and -m options are mutually exclusive. If specified at the same time,
+the last one is used.
 
-The return code is the sum of all cp/mv return codes.
+The return code is the sum of all cp/mv/rm return codes.
 EOT
     }
     keep=1
-    while getopts ":hcmv" opt; do
+    while getopts ":hacmrv" opt; do
         case $opt in
-            c) unset move && (( ++keep ));;
-            m) unset keep && (( ++move ));;
+            a) (( all++ ));;
+            c) unset move clean && (( ++keep ));;
+            m) unset keep clean && (( ++move ));;
+            r) unset move keep && (( ++clean ));;
             v) verbose="-v";;
             h) usage;;
             \?) usage >&2; return 1;;
@@ -3051,26 +3066,35 @@ EOT
     shift "$((OPTIND-1))"
     if (( keep > 0 )); then
         while (( $# > 0 )); do
-            if islinux; then
-                cp $verbose -a "$1" "$1_$current_date"
-            elif isfreebsd; then
-                if [[ -d "$1" ]] && [[ "$1" == */ ]]; then
-                    echo "cowardly refusing to copy $1 's content; see cp(1)" >&2; return 1
-                else
-                    cp $verbose -a "$1" "$1_$current_date"
-                fi
-            else;
-                cp $verbose -pR "$1" "$1_$current_date"
+            if islinux || isfreebsd; then
+                cp $verbose -a "${1%/}" "${1%/}_$current_date"
+            else
+                cp $verbose -pR "${1%/}" "${1%/}_$current_date"
             fi
             (( result += $? ))
             shift
         done
     elif (( move > 0 )); then
         while (( $# > 0 )); do
-            mv $verbose "$1" "$1_$current_date"
+            mv $verbose "${1%/}" "${1%/}_$current_date"
             (( result += $? ))
             shift
         done
+    elif (( clean > 0 )); then
+        if (( $# > 0 )); then
+            while (( $# > 0 )); do
+                rm $verbose -rf "${1%/}"_[0-9](#c4,)-(0[0-9]|1[0-2])-([0-2][0-9]|3[0-1])T([0-1][0-9]|2[0-3])(:[0-5][0-9])(#c2)Z
+                (( result += $? ))
+                shift
+            done
+        else
+            if (( all > 0 )); then
+                rm $verbose -rf *_[0-9](#c4,)-(0[0-9]|1[0-2])-([0-2][0-9]|3[0-1])T([0-1][0-9]|2[0-3])(:[0-5][0-9])(#c2)Z(D)
+            else
+                rm $verbose -rf *_[0-9](#c4,)-(0[0-9]|1[0-2])-([0-2][0-9]|3[0-1])T([0-1][0-9]|2[0-3])(:[0-5][0-9])(#c2)Z
+            fi
+            (( result += $? ))
+        fi
     fi
     return $result
 }