X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=196158dbe616b9dec80b4781367a9fb15c3cdfb5;hb=386c0c49de5531c1a0959a4968eaf265eca873dc;hp=ebe2b1c38732eb18e494c9f94bcddf2d943b3d57;hpb=e020ae7784364f9a29b01dfc785b503f1adc0e87;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index ebe2b1c..196158d 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 @@ -414,23 +418,22 @@ salias() { emulate -L zsh local only=0 ; local multi=0 local key val - while [[ $1 == -* ]] ; do - case $1 in - (-o) only=1 ;; - (-a) multi=1 ;; - (--) shift ; break ;; - (-h) - printf 'usage: salias [-h|-o|-a] \n' + while getopts ":hao" opt; do + case $opt in + o) only=1 ;; + a) multi=1 ;; + h) + printf 'usage: salias [-hoa] \n' printf ' -h shows this help text.\n' printf ' -a replace '\'' ; '\'' sequences with '\'' ; sudo '\''.\n' printf ' be careful using this option.\n' printf ' -o only sets an alias if a preceding sudo would be needed.\n' return 0 ;; - (*) printf "unkown option: '%s'\n" "$1" ; return 1 ;; + *) salias -h >&2; return 1 ;; esac - shift done + shift "$((OPTIND-1))" if (( ${#argv} > 1 )) ; then printf 'Too many arguments %s\n' "${#argv}" @@ -764,14 +767,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)~~"$(/dev/null) if [[ -n $bat ]]; then batfull=${"$(sysctl -n hw.sensors.acpibat${num}.amphour0)"%% *} batwarn=${"$(sysctl -n hw.sensors.acpibat${num}.amphour1)"%% *} @@ -2435,22 +2440,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='command ls -F '${ls_options:+"${ls_options[*]}"} + #a1# List files with colors (\kbd{ls \ldots}) + alias ls="command ls ${ls_options:+${ls_options[*]}}" #a1# List all files, with colors (\kbd{ls -la \ldots}) - alias la='command 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='command 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='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='command ls -lF '${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 -l \ldots})\\&\quad(\kbd{/} for directories, \kbd{@} for symlinks ...) + alias l="command ls -l ${ls_options:+${ls_options[*]}}" else - 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' + alias l='command ls -l' fi alias mdstat='cat /proc/mdstat' @@ -2587,7 +2591,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 @@ -3021,20 +3025,75 @@ 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 + local clean keep move verbose result all to_bk + setopt extended_glob + keep=1 + while getopts ":hacmrv" opt; do + case $opt in + a) (( all++ ));; + c) unset move clean && (( ++keep ));; + m) unset keep clean && (( ++move ));; + r) unset move keep && (( ++clean ));; + v) verbose="-v";; + h) 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, -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/rm return codes. +EOT +return 0;; + \?) bk -h >&2; return 1;; + esac + done + shift "$((OPTIND-1))" + if (( keep > 0 )); then + if islinux || isfreebsd; then + for to_bk in "$@"; do + cp $verbose -a "${to_bk%/}" "${to_bk%/}_$current_date" + (( result += $? )) + done + else + for to_bk in "$@"; do + cp $verbose -pR "${to_bk%/}" "${to_bk%/}_$current_date" + (( result += $? )) + done + fi + elif (( move > 0 )); then + while (( $# > 0 )); do + mv $verbose "${1%/}" "${1%/}_$current_date" + (( result += $? )) + shift + done + elif (( clean > 0 )); then + if (( $# > 0 )); then + for to_bk in "$@"; do + rm $verbose -rf "${to_bk%/}"_[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 += $? )) + 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 - cp -a "$1" "$1_$current_date" + 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 - else; - cp -pR "$1" "$1_$current_date" + (( result += $? )) fi - shift - done + fi + return $result } #f5# cd to directoy and list files