hjp
/
dot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.hjp.at:hjp/dot

This commit is contained in:
Peter J. Holzer 2020-11-12 15:17:29 +01:00 committed by Peter J. Holzer
parent d87a7a5b0a 14b83d3cfc
commit ec477c64f9
1 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
.zshenv
View File

@ -30,6 +30,47 @@ export DEBEMAIL=hjp@hjp.at
export DEB_SIGN_KEYID=4ED25B463C8FC154D8189E64F20E485112FE285D export DEB_SIGN_KEYID=4ED25B463C8FC154D8189E64F20E485112FE285D
export ACK_COLOR_FILENAME='blue on_white' export ACK_COLOR_FILENAME='blue on_white'
# Fix up locale. Must do this early or we get a lot of warnings if a
# locale isn't installed.
# Assume that locale and grep are in the PATH.
case "`uname -sr`" in
Linux*)
export LC_COLLATE=POSIX
if [ -z "$LANG" ]
then
utf=`locale -a | grep en_US.utf8`
if [ -n "$utf" ]
then
# this is a bit of a hack -
# locale -a advertises the locale as "en_US.utf8",
# but the glibc accepts both "en_US.utf8" and
# "en_US.UTF-8" and xterm recogizes only the latter.
# So we explicitely set the latter, even though that's
# not the canonical name and may break some day.
#
LANG=en_US.UTF-8
else
# fall back to latin 1.
LANG=en_US.iso88591
fi
export LANG
fi
for i in LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL
do
c=$(eval "echo \$$i")
if [ -n "$c" ]
then
r=$(locale -a | grep "${c/UTF-8/utf8}")
if [ -z "$r" ]
then
unset $i
fi
fi
done
;;
esac
# don't rely on a sane path at this point: # don't rely on a sane path at this point:
for i in /usr/bin/preppath /usr/local/bin/preppath for i in /usr/bin/preppath /usr/local/bin/preppath
@ -66,32 +107,6 @@ then
unsetopt NULL_GLOB unsetopt NULL_GLOB
fi fi
case "`uname -sr`" in
Linux*)
export LC_COLLATE=POSIX
if [ -z "$LANG" ]
then
utf=`locale -a | grep en_US.utf8`
if [ -n "$utf" ]
then
# this is a bit of a hack -
# locale -a advertises the locale as "en_US.utf8",
# but the glibc accepts both "en_US.utf8" and
# "en_US.UTF-8" and xterm recogizes only the latter.
# So we explicitely set the latter, even though that's
# not the canonical name and may break some day.
#
LANG=en_US.UTF-8
else
# fall back to latin 1.
LANG=en_US.iso88591
fi
export LANG
fi
# export LC_TIME=de_AT # don't remember what that was for
;;
esac
case "$LANG" in case "$LANG" in
*.iso88591) *.iso88591)
export LESSCHARSET=latin1 export LESSCHARSET=latin1