projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zshrc: vman: Handle zero arguments [Closes: issue993]
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
43f2608
..
a68687f
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-938,7
+938,10
@@
bindkey '^z' grml-zsh-fg
# run command line as user root via sudo:
sudo-command-line() {
[[ -z $BUFFER ]] && zle up-history
# run command line as user root via sudo:
sudo-command-line() {
[[ -z $BUFFER ]] && zle up-history
- [[ $BUFFER != sudo\ * ]] && BUFFER="sudo $BUFFER"
+ if [[ $BUFFER != sudo\ * ]]; then
+ BUFFER="sudo $BUFFER"
+ CURSOR=$(( CURSOR+5 ))
+ fi
}
zle -N sudo-command-line
}
zle -N sudo-command-line
@@
-2052,9
+2055,7
@@
function info_print () {
esc_end="$2"
shift 2
printf '%s' ${esc_begin}
esc_end="$2"
shift 2
printf '%s' ${esc_begin}
- for item in "$@" ; do
- printf '%s ' "$item"
- done
+ printf '%s' "$*"
printf '%s' "${esc_end}"
}
printf '%s' "${esc_end}"
}
@@
-3079,14
+3080,14
@@
exit 0;
ssl_hashes=( sha512 sha256 sha1 md5 )
for sh in ${ssl_hashes}; do
ssl_hashes=( sha512 sha256 sha1 md5 )
for sh in ${ssl_hashes}; do
-
ssl-cert-${sh}
() {
+
eval 'ssl-cert-'${sh}'
() {
emulate -L zsh
if [[ -z $1 ]] ; then
emulate -L zsh
if [[ -z $1 ]] ; then
- printf '
usage: %s <file>\n' "ssh-cert-${sh}
"
+ printf '
\''usage: %s <file>\n'\'' "ssh-cert-'${sh}'
"
return 1
fi
return 1
fi
- openssl x509 -noout -fingerprint -
${sh}
-in $1
- }
+ openssl x509 -noout -fingerprint -
'${sh}'
-in $1
+ }
'
done; unset sh
ssl-cert-fingerprints() {
done; unset sh
ssl-cert-fingerprints() {
@@
-3124,6
+3125,9
@@
if [[ -r ~/.important_commands ]] ; then
fi
# }}}
fi
# }}}
+# load the lookup subsystem if it's available on the system
+zrcautoload lookupinit && lookupinit
+
#:grep:marker:for:mika: :-)
### non-root (EUID != 0) code below
###
#:grep:marker:for:mika: :-)
### non-root (EUID != 0) code below
###
@@
-3133,8
+3137,6
@@
if (( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) ; then
return 0
fi
return 0
fi
-zrcautoload lookupinit && lookupinit
-
# variables {{{
# set terminal property (used e.g. by msgid-chooser)
# variables {{{
# set terminal property (used e.g. by msgid-chooser)
@@
-3208,9
+3210,9
@@
alias lsd='ls -d *(/)' # only show directories
#a2# Only show empty directories
alias lse='ls -d *(/^F)' # only show empty directories
#a2# Display the ten newest files
#a2# Only show empty directories
alias lse='ls -d *(/^F)' # only show empty directories
#a2# Display the ten newest files
-alias lsnew="ls -r
l *(D.om[1,10])"
# display the newest files
+alias lsnew="ls -r
tlh *(D.om[1,10])"
# display the newest files
#a2# Display the ten oldest files
#a2# Display the ten oldest files
-alias lsold="ls -rtlh *(D.
o
m[1,10])" # display the oldest files
+alias lsold="ls -rtlh *(D.
O
m[1,10])" # display the oldest files
#a2# Display the ten smallest files
alias lssmall="ls -Srl *(.oL[1,10])" # display the smallest files
#a2# Display the ten smallest files
alias lssmall="ls -Srl *(.oL[1,10])" # display the smallest files
@@
-3709,7
+3711,11
@@
show-archive() {
#f5# Use \kbd{vim} as your manpage reader
vman() {
emulate -L zsh
#f5# Use \kbd{vim} as your manpage reader
vman() {
emulate -L zsh
- man $* | col -b | view -c 'set ft=man nomod nolist' -
+ if (( ${#argv} == 0 )); then
+ printf 'usage: vman <topic>\n'
+ return 1
+ fi
+ man "$@" | col -b | view -c 'set ft=man nomod nolist' -
}
# function readme() { $PAGER -- (#ia3)readme* }
}
# function readme() { $PAGER -- (#ia3)readme* }