X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=894eb886654911115aa14a285def90164f32b114;hb=500599cffc63fdd98aaf4bf8c67d627e23961785;hp=b7b2caf99260accad97e66955ae24afbc97a6c06;hpb=fe25fa0be72344bacd156cf0da78784d3aadcf4a;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index b7b2caf..894eb88 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -1582,26 +1582,6 @@ if [[ -r /etc/debian_version ]] ; then #a3# Execute \kbd{grep-excuses} alias ge='grep-excuses' - # debian upgrade - #f3# Execute \kbd{apt-get update \&\& }\\&\quad \kbd{apt-get dist-upgrade} - upgrade() { - emulate -L zsh - if [[ -z $1 ]] ; then - $SUDO apt-get update - $SUDO apt-get -u upgrade - else - ssh $1 $SUDO apt-get update - # ask before the upgrade - local dummy - ssh $1 $SUDO apt-get --no-act upgrade - echo -n 'Process the upgrade?' - read -q dummy - if [[ $dummy == "y" ]] ; then - ssh $1 $SUDO apt-get -u upgrade --yes - fi - fi - } - # get a root shell as normal user in live-cd mode: if isgrmlcd && [[ $UID -ne 0 ]] ; then alias su="sudo su" @@ -1634,35 +1614,6 @@ EOMESS fi fi -# get_tw_cli has been renamed into get_3ware -if check_com -c get_3ware ; then - get_tw_cli() { - echo 'Warning: get_tw_cli has been renamed into get_3ware. Invoking get_3ware for you.'>&2 - get_3ware - } -fi - -# I hate lacking backward compatibility, so provide an alternative therefore -if ! check_com -c apache2-ssl-certificate ; then - - apache2-ssl-certificate() { - - print 'Debian does not ship apache2-ssl-certificate anymore (see #398520). :(' - print 'You might want to take a look at Debian the package ssl-cert as well.' - print 'To generate a certificate for use with apache2 follow the instructions:' - - echo ' - -export RANDFILE=/dev/random -mkdir /etc/apache2/ssl/ -openssl req $@ -new -x509 -days 365 -nodes -out /etc/apache2/ssl/apache.pem -keyout /etc/apache2/ssl/apache.pem -chmod 600 /etc/apache2/ssl/apache.pem - -Run "grml-tips ssl-certificate" if you need further instructions. -' - } -fi - # Use hard limits, except for a smaller stack and no core dumps unlimit is425 && limit stack 8192 @@ -1879,9 +1830,6 @@ is4 && nt() { # shell functions -#f1# Provide csh compatibility -setenv() { typeset -x "${1}${1:+=}${(@)argv[2,$#]}" } # csh compatibility - #f1# Reload an autoloadable function freload() { while (( $# )); do; unfunction $1; autoload -U $1; shift; done } compdef _functions freload @@ -1897,15 +1845,6 @@ sll() { done } -# fast manual access -if check_com qma ; then - #f1# View the zsh manual - manzsh() { qma zshall "$1" } - compdef _man qma -else - manzsh() { /usr/bin/man zshall | vim -c "se ft=man| se hlsearch" +/"$1" - ; } -fi - # TODO: Is it supported to use pager settings like this? # PAGER='less -Mr' - If so, the use of $PAGER here needs fixing # with respect to wordsplitting. (ie. ${=PAGER}) @@ -2188,8 +2127,6 @@ help-zle() #k# display help for keybindings and ZLE (cycle pages with consecutive use) zle -N help-zle && bindkey '^Xz' help-zle -check_com -c qma && alias ?='qma zshall' - # grep for running process, like: 'any vim' any() { emulate -L zsh @@ -2212,19 +2149,6 @@ deswap() { print 'Finished, running "swapoff -a; swapon -a" may also be useful.' } -# spawn a minimally set up mksh - useful if you want to umount /usr/. -minimal-shell() { - emulate -L zsh - local shell="/bin/mksh" - - if [[ ! -x ${shell} ]]; then - printf '`%s'\'' not available, giving up.\n' ${shell} >&2 - return 1 - fi - - exec env -i ENV="/etc/minimal-shellrc" HOME="$HOME" TERM="$TERM" ${shell} -} - # a wrapper for vim, that deals with title setting # VIM_OPTIONS # set this array to a set of options to vim you always want @@ -2441,9 +2365,10 @@ cd() { } #f5# Create Directoy and \kbd{cd} to it -mcd() { +mkcd() { mkdir -p "$@" && cd "$@" } + #f5# Create temporary directory and \kbd{cd} to it cdt() { local t @@ -2486,22 +2411,6 @@ inplaceMkDirs() { #k# mkdir -p from string under cursor or marked area zle -N inplaceMkDirs && bindkey '^XM' inplaceMkDirs -# Function Usage: doc packagename -#f5# \kbd{cd} to /usr/share/doc/\textit{package} -doc() { - emulate -L zsh - cd /usr/share/doc/$1 && ls -} -_doc() { _files -W /usr/share/doc -/ } -check_com compdef && compdef _doc doc - -#f5# Make screenshot -sshot() { - [[ ! -d ~/shots ]] && mkdir ~/shots - #cd ~/shots ; sleep 5 ; import -window root -depth 8 -quality 80 `date "+%Y-%m-%d--%H:%M:%S"`.png - cd ~/shots ; sleep 5; import -window root shot_`date --iso-8601=m`.jpg -} - #f5# List files which have been accessed within the last {\it n} days, {\it n} defaults to 1 accessed() { emulate -L zsh