projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.4.02
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
65f457f
..
0f6c36f
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-1325,7
+1325,7
@@
is4 && [[ $NOPRECMD -eq 0 ]] && precmd () {
fi
fi
# just use DONTSETRPROMPT=1 to be able to overwrite RPROMPT
fi
fi
# just use DONTSETRPROMPT=1 to be able to overwrite RPROMPT
- if [[ $
DONTSETRPROMPT
-eq 0 ]] ; then
+ if [[ $
{DONTSETRPROMPT:-}
-eq 0 ]] ; then
if [[ $BATTERY -gt 0 ]] ; then
# update battery (dropped into $PERCENT) information
battery
if [[ $BATTERY -gt 0 ]] ; then
# update battery (dropped into $PERCENT) information
battery
@@
-1336,7
+1336,7
@@
is4 && [[ $NOPRECMD -eq 0 ]] && precmd () {
fi
# adjust title of xterm
# see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html
fi
# adjust title of xterm
# see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html
- [[ ${NOTITLE} -gt 0 ]] && return 0
+ [[ ${NOTITLE
:-
} -gt 0 ]] && return 0
case $TERM in
(xterm*|rxvt*)
set_title ${(%):-"%n@%m: %~"}
case $TERM in
(xterm*|rxvt*)
set_title ${(%):-"%n@%m: %~"}
@@
-2481,17
+2481,6
@@
fi
# set terminal property (used e.g. by msgid-chooser)
export COLORTERM="yes"
# set terminal property (used e.g. by msgid-chooser)
export COLORTERM="yes"
-# set default browser
-if [[ -z "$BROWSER" ]] ; then
- if [[ -n "$DISPLAY" ]] ; then
- #v# If X11 is running
- check_com -c firefox && export BROWSER=firefox
- else
- #v# If no X11 is running
- check_com -c w3m && export BROWSER=w3m
- fi
-fi
-
#m# v QTDIR \kbd{/usr/share/qt[34]}\quad [for non-root only]
[[ -d /usr/share/qt3 ]] && export QTDIR=/usr/share/qt3
[[ -d /usr/share/qt4 ]] && export QTDIR=/usr/share/qt4
#m# v QTDIR \kbd{/usr/share/qt[34]}\quad [for non-root only]
[[ -d /usr/share/qt3 ]] && export QTDIR=/usr/share/qt3
[[ -d /usr/share/qt4 ]] && export QTDIR=/usr/share/qt4
@@
-3178,7
+3167,7
@@
simple-extract() {
elif [[ "$ARCHIVE" == (#s)(https|http|ftp)://* ]] ; then
if check_com curl; then
elif [[ "$ARCHIVE" == (#s)(https|http|ftp)://* ]] ; then
if check_com curl; then
- WGET_CMD="curl -k -s -o -"
+ WGET_CMD="curl -
L -
k -s -o -"
elif check_com wget; then
WGET_CMD="wget -q -O - --no-check-certificate"
else
elif check_com wget; then
WGET_CMD="wget -q -O - --no-check-certificate"
else