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

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 3deb1e0..94561d3 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -1729,8 +1729,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 +2411,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
 
@@ -3021,10 +3019,25 @@ 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`
+    while (( $# > 0 )); do
+        if islinux; then
+            cp -a "$1" "$1_$(date --iso-8601=m)"
+        elif isopenbsd; then
+            cp -R "$1" "$1_$(date "+%FT%H:%M")"
+        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_$(date "+%FT%H:%M")"
+            fi
+        else;
+            echo 'sorry, not yet implemented, send a patch!' >&2
+        fi
+        shift
+    done
 }
 
 #f5# cd to directoy and list files