X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=14923e72b36539bbb26ed55cfe3dac5bf757ffac;hb=cd79c201bb20c367fa87563d6cf0ff36a9fee1d7;hp=2b434ec82c4e9ea01f0db67da986ceffa97458e3;hpb=7f858dce86fab8aa7503969aa2343c6660834078;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 2b434ec..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 @@ -1697,10 +1696,10 @@ fi batteryopenbsd(){ GRML_BATTERY_LEVEL='' -local batfull batwarn batnow num +local bat batfull batwarn batnow num for num in 0 1 ; do - bat=$(sysctl -n hw.sensors.acpibat${num}) - if [[ ! -z $bat ]]; then + 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)"%% *} batnow=${"$(sysctl -n hw.sensors.acpibat${num}.amphour3)"%% *} @@ -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 @@ -1755,22 +1754,24 @@ batterydarwin(){ GRML_BATTERY_LEVEL='' local -a table table=( ${$(pmset -g ps)[(w)7,8]%%(\%|);} ) -case $table[2] in - charging) - GRML_BATTERY_LEVEL+=" ^" - ;; - discharging) - if (( $table[1] < 20 )) ; then - GRML_BATTERY_LEVEL+=" !v" - else - GRML_BATTERY_LEVEL+=" v" - fi - ;; - *) - GRML_BATTERY_LEVEL+=" =" - ;; -esac -GRML_BATTERY_LEVEL+="$table[1]%%" +if [[ -n $table[2] ]] ; then + case $table[2] in + charging) + GRML_BATTERY_LEVEL+=" ^" + ;; + discharging) + if (( $table[1] < 20 )) ; then + GRML_BATTERY_LEVEL+=" !v" + else + GRML_BATTERY_LEVEL+=" v" + fi + ;; + *) + GRML_BATTERY_LEVEL+=" =" + ;; + esac + GRML_BATTERY_LEVEL+="$table[1]%%" +fi } # set variable debian_chroot if running in a chroot with /etc/debian_chroot @@ -2409,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 @@ -2436,21 +2435,21 @@ fi # do we have GNU ls with color-support? if [[ "$TERM" != dumb ]]; then #a1# List files with colors (\kbd{ls -F \ldots}) - alias ls='ls -F '${ls_options:+"${ls_options[*]}"} + alias ls='command ls -F '${ls_options:+"${ls_options[*]}"} #a1# List all files, with colors (\kbd{ls -la \ldots}) - alias la='ls -la '${ls_options:+"${ls_options[*]}"} + alias la='command ls -la '${ls_options:+"${ls_options[*]}"} #a1# List files with long colored list, without dotfiles (\kbd{ls -l \ldots}) - alias ll='ls -l '${ls_options:+"${ls_options[*]}"} + alias ll='command ls -l '${ls_options:+"${ls_options[*]}"} #a1# List files with long colored list, human readable sizes (\kbd{ls -hAl \ldots}) - alias lh='ls -hAl '${ls_options:+"${ls_options[*]}"} + alias lh='command ls -hAl '${ls_options:+"${ls_options[*]}"} #a1# List files with long colored list, append qualifier to filenames (\kbd{ls -lF \ldots})\\&\quad(\kbd{/} for directories, \kbd{@} for symlinks ...) - alias l='ls -lF '${ls_options:+"${ls_options[*]}"} + alias l='command ls -lF '${ls_options:+"${ls_options[*]}"} else - alias ls='ls -F' - alias la='ls -la' - alias ll='ls -l' - alias lh='ls -hAl' - alias l='ls -lF' + alias ls='command ls -F' + alias la='command ls -la' + alias ll='command ls -l' + alias lh='command ls -hAl' + alias l='command ls -lF' fi alias mdstat='cat /proc/mdstat' @@ -2955,40 +2954,38 @@ 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} -alias dir="ls -lSrah" +alias dir="command ls -lSrah" #a2# Only show dot-directories -alias lad='ls -d .*(/)' +alias lad='command ls -d .*(/)' #a2# Only show dot-files -alias lsa='ls -a .*(.)' +alias lsa='command ls -a .*(.)' #a2# Only files with setgid/setuid/sticky flag -alias lss='ls -l *(s,S,t)' +alias lss='command ls -l *(s,S,t)' #a2# Only show symlinks -alias lsl='ls -l *(@)' +alias lsl='command ls -l *(@)' #a2# Display only executables -alias lsx='ls -l *(*)' +alias lsx='command ls -l *(*)' #a2# Display world-{readable,writable,executable} files -alias lsw='ls -ld *(R,W,X.^ND/)' +alias lsw='command ls -ld *(R,W,X.^ND/)' #a2# Display the ten biggest files -alias lsbig="ls -flh *(.OL[1,10])" +alias lsbig="command ls -flh *(.OL[1,10])" #a2# Only show directories -alias lsd='ls -d *(/)' +alias lsd='command ls -d *(/)' #a2# Only show empty directories -alias lse='ls -d *(/^F)' +alias lse='command ls -d *(/^F)' #a2# Display the ten newest files -alias lsnew="ls -rtlh *(D.om[1,10])" +alias lsnew="command ls -rtlh *(D.om[1,10])" #a2# Display the ten oldest files -alias lsold="ls -rtlh *(D.Om[1,10])" +alias lsold="command ls -rtlh *(D.Om[1,10])" #a2# Display the ten smallest files -alias lssmall="ls -Srl *(.oL[1,10])" +alias lssmall="command ls -Srl *(.oL[1,10])" #a2# Display the ten newest directories and ten newest .directories -alias lsnewdir="ls -rthdl *(/om[1,10]) .*(D/om[1,10])" +alias lsnewdir="command ls -rthdl *(/om[1,10]) .*(D/om[1,10])" #a2# Display the ten oldest directories and ten oldest .directories -alias lsolddir="ls -rthdl *(/Om[1,10]) .*(D/Om[1,10])" +alias lsolddir="command ls -rthdl *(/Om[1,10]) .*(D/Om[1,10])" # some useful aliases #a2# Remove current empty directory. Execute \kbd{cd ..; rmdir \$OLDCWD} @@ -3019,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