From e23adb45813569c30dbb5d7eb029dd3e9437ac5f Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 1 Apr 2007 11:42:55 +0200 Subject: [PATCH] check for most before assigning aliases dchange and uchange --- debian/changelog | 6 ++++-- etc/zsh/zshrc | 56 +++++++++++++++++++++++++++++--------------------------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index e89c90a..0901c78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ grml-etc-core (0.2.39) unstable; urgency=low - * /etc/zsh/zshrc: added alias mdstat for 'cat /proc/mdstat' and - alias ... which does a 'cd ../../'. Thanks, gebi! + * /etc/zsh/zshrc: + - added alias mdstat for 'cat /proc/mdstat' and + alias ... which does a 'cd ../../'. Thanks, gebi! + - check for 'most' before assigning aliases dchange and uchange -- Michael Prokop Thu, 29 Mar 2007 00:22:28 +0200 diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 10b0d8f..a9fe3ce 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -984,33 +984,35 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." # manzsh() { man zshall | $MYLESS -p $1 ; } fi -# use "dchange " to view Debian's changelog of the package: - dchange() { - if [ -r /usr/share/doc/${1}/changelog.Debian.gz ] ; then - most /usr/share/doc/${1}/changelog.Debian.gz - else - if [ -r /usr/share/doc/${1}/changelog.gz ] ; then - most /usr/share/doc/${1}/changelog.gz - else - echo "No changelog for package $1 found, sorry." - return 1 - fi - fi - } - _dchange() { _files -W /usr/share/doc -/ } - compdef _dchange dchange - -# use "uchange " to view upstream's changelog of the package: - uchange() { - if [ -r /usr/share/doc/${1}/changelog.gz ] ; then - most /usr/share/doc/${1}/changelog.gz - else - echo "No changelog for package $1 found, sorry." - return 1 - fi - } - _uchange() { _files -W /usr/share/doc -/ } - compdef _uchange uchange + if [ -x /usr/bin/most ] ; then + # use "dchange " to view Debian's changelog of the package: + dchange() { + if [ -r /usr/share/doc/${1}/changelog.Debian.gz ] ; then + most /usr/share/doc/${1}/changelog.Debian.gz + else + if [ -r /usr/share/doc/${1}/changelog.gz ] ; then + most /usr/share/doc/${1}/changelog.gz + else + echo "No changelog for package $1 found, sorry." + return 1 + fi + fi + } + _dchange() { _files -W /usr/share/doc -/ } + compdef _dchange dchange + + # use "uchange " to view upstream's changelog of the package: + uchange() { + if [ -r /usr/share/doc/${1}/changelog.gz ] ; then + most /usr/share/doc/${1}/changelog.gz + else + echo "No changelog for package $1 found, sorry." + return 1 + fi + } + _uchange() { _files -W /usr/share/doc -/ } + compdef _uchange uchange + fi # zsh profiling profile () { -- 2.1.4