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

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 54572f1..14923e7 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -1698,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)"%% *}
@@ -3020,20 +3020,59 @@ fi
 bk() {
     emulate -L zsh
     local current_date=$(date -u "+%Y-%m-%dT%H:%M:%SZ")
-    while (( $# > 0 )); do
-        if islinux; then
-            cp -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 -a "$1" "$1_$current_date"
-            fi
-        else;
-            cp -pR "$1" "$1_$current_date"
-        fi
-        shift
+    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