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

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 3deb1e0..14923e7 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -1393,7 +1393,6 @@ bind2maps emacs             -- Left   backward-char
 bind2maps       viins vicmd -- Left   vi-backward-char
 bind2maps emacs             -- Right  forward-char
 bind2maps       viins vicmd -- Right  vi-forward-char
-bind2maps       viins vicmd -- Right  vi-forward-char
 #k# Perform abbreviation expansion
 bind2maps emacs viins       -- -s '^x.' zleiab
 #k# Display list of abbreviations that would expand
@@ -1699,7 +1698,7 @@ batteryopenbsd(){
 GRML_BATTERY_LEVEL=''
 local bat batfull batwarn batnow num
 for num in 0 1 ; do
-    bat=$(sysctl -n hw.sensors.acpibat${num})
+    bat=$(sysctl -n hw.sensors.acpibat${num} 2>/dev/null)
     if [[ -n $bat ]]; then
         batfull=${"$(sysctl -n hw.sensors.acpibat${num}.amphour0)"%% *}
         batwarn=${"$(sysctl -n hw.sensors.acpibat${num}.amphour1)"%% *}
@@ -1729,8 +1728,8 @@ GRML_BATTERY_LEVEL=''
 local num
 local -A table
 for num in 0 1 ; do
-    table=( ${=${${${${${(M)${(f)"$(acpiconf -i $num)"}:#(State|Remaining capacity):*}%%( ##|%)}//:[ $'\t']##/@}// /-}//@/ }} )
-    if [[ $table[State] != "not-present" ]] ; then
+    table=( ${=${${${${${(M)${(f)"$(acpiconf -i $num 2>&1)"}:#(State|Remaining capacity):*}%%( ##|%)}//:[ $'\t']##/@}// /-}//@/ }} )
+    if [[ -n $table ]] && [[ $table[State] != "not-present" ]] ; then
         case $table[State] in
             *discharging*)
                 if (( $table[Remaining-capacity] < 20 )) ; then
@@ -2411,8 +2410,6 @@ hash -d linux=/lib/modules/$(command uname -r)/build/
 hash -d log=/var/log
 hash -d slog=/var/log/syslog
 hash -d src=/usr/src
-hash -d templ=/usr/share/doc/grml-templates
-hash -d tt=/usr/share/doc/texttools-doc
 hash -d www=/var/www
 #d# end
 
@@ -2957,8 +2954,6 @@ export COLORTERM="yes"
 # general
 #a2# Execute \kbd{du -sch}
 alias da='du -sch'
-#a2# Execute \kbd{jobs -l}
-alias j='jobs -l'
 
 # listing stuff
 #a2# Execute \kbd{ls -lSrah}
@@ -3021,10 +3016,63 @@ fi
 
 # useful functions
 
-#f5# Backup \kbd{file {\rm to} file\_timestamp}
+#f5# Backup \kbd{file_or_folder {\rm to} file_or_folder\_timestamp}
 bk() {
     emulate -L zsh
-    cp -b $1 $1_`date --iso-8601=m`
+    local current_date=$(date -u "+%Y-%m-%dT%H:%M:%SZ")
+    local keep move verbose result
+    usage() {
+        cat << EOT
+bk [-hcmv] FILE [FILE ...]
+Backup a file or folder in place and append the timestamp
+
+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)
+-v    Verbose
+
+The -c and -m options can't be used at the same time. If both specified, the
+last one is used.
+
+The return code is the sum of all cp/mv return codes.
+EOT
+    }
+    keep=1
+    while getopts ":hcmv" opt; do
+        case $opt in
+            c) unset move && (( ++keep ));;
+            m) unset keep && (( ++move ));;
+            v) verbose="-v";;
+            h) usage;;
+            \?) usage >&2; return 1;;
+        esac
+    done
+    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"
+            fi
+            (( result += $? ))
+            shift
+        done
+    elif (( move > 0 )); then
+        while (( $# > 0 )); do
+            mv $verbose "$1" "$1_$current_date"
+            (( result += $? ))
+            shift
+        done
+    fi
+    return $result
 }
 
 #f5# cd to directoy and list files