projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use aptitude safe-upgrade instead of aptitude upgrade
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
80503fa
..
4f41604
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-11,8
+11,8
@@
#
# Global Order: zshenv, zprofile, zshrc, zlogin
################################################################################
#
# Global Order: zshenv, zprofile, zshrc, zlogin
################################################################################
-#
-# zsh-refcard-tag documentation:
+
+# zsh-refcard-tag documentation:
{{{
# You may notice strange looking comments in the zshrc (and ~/.zshrc as
# well). These are there for a purpose. grml's zsh-refcard can now be
# automatically generated from the contents of the actual configuration
# You may notice strange looking comments in the zshrc (and ~/.zshrc as
# well). These are there for a purpose. grml's zsh-refcard can now be
# automatically generated from the contents of the actual configuration
@@
-20,7
+20,7
@@
# and what lines of code to take into account (and for what purpose).
#
# Here is what they mean:
# and what lines of code to take into account (and for what purpose).
#
# Here is what they mean:
-#
{{{
+#
# List of tags (comment types) used:
# #a# Next line contains an important alias, that should
# be included in the grml-zsh-refcard.
# List of tags (comment types) used:
# #a# Next line contains an important alias, that should
# be included in the grml-zsh-refcard.
@@
-235,7
+235,6
@@
export MAIL=${MAIL:-/var/mail/$USER}
# if we don't set $SHELL then aterm, rxvt,.. will use /bin/sh or /bin/bash :-/
export SHELL='/bin/zsh'
export MAIL=${MAIL:-/var/mail/$USER}
# if we don't set $SHELL then aterm, rxvt,.. will use /bin/sh or /bin/bash :-/
export SHELL='/bin/zsh'
- [[ -f ~/.terminfo/m/mostlike ]] && MYLESS='LESS=C TERMINFO=~/.terminfo TERM=mostlike less' || MYLESS='less'
[ -x $(which dircolors) ] && eval `dircolors -b`
# Search path for the cd command
[ -x $(which dircolors) ] && eval `dircolors -b`
# Search path for the cd command
@@
-839,6
+838,13
@@
${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# "
# I like clean prompt, so provide simple way to get that
alias 0 &>/dev/null || functions 0 &>/dev/null || alias 0='return 0'
# I like clean prompt, so provide simple way to get that
alias 0 &>/dev/null || functions 0 &>/dev/null || alias 0='return 0'
+# for really lazy people like mika:
+ type S &>/dev/null || alias S='screen'
+ type s &>/dev/null || alias s='ssh'
+
+# get top 10 shell commands:
+ alias top10='print -l ? ${(o)history%% *} | uniq -c | sort -nr | head -n 10'
+
# truecrypt; use e.g. via 'truec /dev/ice /mnt/ice' or 'truec -i'
if [ -x $(which truecrypt) ] ; then
if isutfenv ; then
# truecrypt; use e.g. via 'truec /dev/ice /mnt/ice' or 'truec -i'
if [ -x $(which truecrypt) ] ; then
if isutfenv ; then
@@
-916,8
+922,8
@@
Enjoy your grml system with the zsh!$reset_color"
salias ag="apt-get upgrade"
#a3# Execute \kbd{apt-get update}
salias au="apt-get update"
salias ag="apt-get upgrade"
#a3# Execute \kbd{apt-get update}
salias au="apt-get update"
- #a3# Execute \kbd{aptitude update ; aptitude upgrade}
- salias -a up="aptitude update ; aptitude upgrade"
+ #a3# Execute \kbd{aptitude update ; aptitude
safe-
upgrade}
+ salias -a up="aptitude update ; aptitude
safe-
upgrade"
#a3# Execute \kbd{dpkg-buildpackage}
alias dbp='dpkg-buildpackage'
#a3# Execute \kbd{grep-excuses}
#a3# Execute \kbd{dpkg-buildpackage}
alias dbp='dpkg-buildpackage'
#a3# Execute \kbd{grep-excuses}
@@
-1146,7
+1152,7
@@
grmlstuff() {
# people should use 'grml-x'!
startx() {
if [ -e /etc/X11/xorg.conf ] ; then
# people should use 'grml-x'!
startx() {
if [ -e /etc/X11/xorg.conf ] ; then
- [ -x /usr/bin/startx ] && /usr/bin/startx
|| /usr/X11R6/bin/startx
+ [ -x /usr/bin/startx ] && /usr/bin/startx
"$@" || /usr/X11R6/bin/startx "$@"
else
echo "Please use the script \"grml-x\" for starting the X Window System
because there does not exist /etc/X11/xorg.conf yet.
else
echo "Please use the script \"grml-x\" for starting the X Window System
because there does not exist /etc/X11/xorg.conf yet.
@@
-1248,6
+1254,7
@@
If you want to use xinit anyway please call \"/usr/bin/xinit\"."
else
manzsh() { /usr/bin/man zshall | vim -c "se ft=man| se hlsearch" +/"$1" - ; }
# manzsh() { /usr/bin/man zshall | most +/"$1" ; }
else
manzsh() { /usr/bin/man zshall | vim -c "se ft=man| se hlsearch" +/"$1" - ; }
# manzsh() { /usr/bin/man zshall | most +/"$1" ; }
+ # [[ -f ~/.terminfo/m/mostlike ]] && MYLESS='LESS=C TERMINFO=~/.terminfo TERM=mostlike less' || MYLESS='less'
# manzsh() { man zshall | $MYLESS -p $1 ; }
fi
# manzsh() { man zshall | $MYLESS -p $1 ; }
fi
@@
-1256,11
+1263,13
@@
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
if type -p aptitude &>/dev/null ; then
echo "No changelog for package $1 found, using aptitude to retrieve it."
if isgrml ; then
else
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
tsclient
+ aptitude -t unstable changelog
${1}
else
aptitude changelog ${1}
fi
else
aptitude changelog ${1}
fi