projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
/etc/zsh/zshrc: dchange() - restore old behaviour
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
c05bc6c
..
53e5177
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-3,7
+3,7
@@
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change:
Fre Jun 29 11:46:37
CEST 2007 [mika]
+# Latest change:
Sam Jul 07 10:56:20
CEST 2007 [mika]
################################################################################
# This file is sourced only for interactive shells. It
# should contain commands to set up aliases, functions,
################################################################################
# This file is sourced only for interactive shells. It
# should contain commands to set up aliases, functions,
@@
-567,6
+567,7
@@
fi
setopt auto_pushd # make cd push the old directory onto the directory stack.
setopt nonomatch # try to avoid the 'zsh: no matches found...'
setopt nobeep # avoid "beep"ing
setopt auto_pushd # make cd push the old directory onto the directory stack.
setopt nonomatch # try to avoid the 'zsh: no matches found...'
setopt nobeep # avoid "beep"ing
+ setopt pushd_ignore_dups # don't push the same dir twice.
MAILCHECK=30 # mailchecks
REPORTTIME=5 # report about cpu-/system-/user-time of command if running longer than 5 seconds
MAILCHECK=30 # mailchecks
REPORTTIME=5 # report about cpu-/system-/user-time of command if running longer than 5 seconds
@@
-601,7
+602,7
@@
fi
# dirstack handling {{{
DIRSTACKSIZE=20
if [[ -f ~/.zdirs ]] && [[ ${#dirstack[*]} -eq 0 ]]; then
# dirstack handling {{{
DIRSTACKSIZE=20
if [[ -f ~/.zdirs ]] && [[ ${#dirstack[*]} -eq 0 ]]; then
- dirstack=( ${(
u
f)"$(< ~/.zdirs)"} )
+ dirstack=( ${(f)"$(< ~/.zdirs)"} )
# "cd -" won't work after login by just setting $OLDPWD, so
[[ -d $dirstack[0] ]] && cd $dirstack[0] && cd $OLDPWD
fi
# "cd -" won't work after login by just setting $OLDPWD, so
[[ -d $dirstack[0] ]] && cd $dirstack[0] && cd $OLDPWD
fi
@@
-790,7
+791,7
@@
${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# "
alias ...='cd ../../'
# generate alias named "$KERNELVERSION-reboot" so you can use boot with kexec:
alias ...='cd ../../'
# generate alias named "$KERNELVERSION-reboot" so you can use boot with kexec:
- if [ -x /sbin/kexec ] ; then
+ if [ -x /sbin/kexec
-a -r /proc/cmdline
] ; then
alias "$(uname -r)-reboot"="kexec -l --initrd=/boot/initrd.img-"$(uname -r)" --command-line=\"$(cat /proc/cmdline)\" /boot/vmlinuz-"$(uname -r)""
fi
alias "$(uname -r)-reboot"="kexec -l --initrd=/boot/initrd.img-"$(uname -r)" --command-line=\"$(cat /proc/cmdline)\" /boot/vmlinuz-"$(uname -r)""
fi
@@
-1255,9
+1256,16
@@
If you want to use xinit anyway please call \"/usr/bin/xinit\"."
dchange() {
if [ -r /usr/share/doc/${1}/changelog.Debian.gz ] ; then
most /usr/share/doc/${1}/changelog.Debian.gz
dchange() {
if [ -r /usr/share/doc/${1}/changelog.Debian.gz ] ; then
most /usr/share/doc/${1}/changelog.Debian.gz
+ elif [ -r /usr/share/doc/${1}/changelog.gz ] ; then
+ most /usr/share/doc/${1}/changelog.gz
else
else
- if [ -r /usr/share/doc/${1}/changelog.gz ] ; then
- most /usr/share/doc/${1}/changelog.gz
+ if type -p aptitude &>/dev/null ; then
+ echo "No changelog for package $1 found, using aptitude to retrieve it."
+ if isgrml ; then
+ aptitude -t unstable changelog ${1}
+ else
+ aptitude changelog ${1}
+ fi
else
echo "No changelog for package $1 found, sorry."
return 1
else
echo "No changelog for package $1 found, sorry."
return 1