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

Merge branch 'master' into hjp

This commit is contained in:
Peter J. Holzer 2020-10-28 12:29:58 +01:00
parent 985b8edd6f 14b83d3cfc
commit f0d2b7e788
2 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.zlogin
View File

@ -1,13 +1,7 @@
# #
# $Id: .zlogin,v 1.9 2003-08-10 17:09:17 hjp Exp $
#
# this is sourced for login shells after .zshrc # this is sourced for login shells after .zshrc
# #
mesg y mesg y
if [ "`uname`" = "HP-UX" ]
then
ps -fu $LOGNAME
fi
date date
uptime uptime

88
.zshenv
View File

@ -30,44 +30,9 @@ 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
# don't rely on a sane path at this point: # locale isn't installed.
for i in /usr/bin/preppath /usr/local/bin/preppath # Assume that locale and grep are in the PATH.
do
if [ -x $i ]
then
preppath=$i
break;
fi
done
if [ -n "$preppath" ]
then
if [ -r /etc/PATH ]
then
PATH=$($preppath $(cat /etc/PATH) )
fi
# first prepend important stuff - in order of increasing priority:
setopt NULL_GLOB
PATH=`$preppath -c /usr/bin/X11:/usr/games:/usr/contrib/bin`
PATH=`$preppath -c /bin:/usr/bin`
PATH=`$preppath -c /usr/sbin:/sbin`
PATH=`$preppath -c /usr/local/sbin:/usr/local/bin`
`$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin`
`$preppath -c -e -r /usr/lib/go-1.*/bin`
`$preppath -c -e -r /usr/local/go-1.*/bin`
`$preppath -c -e -r $HOME/go/bin`
PATH=`$preppath -c $HOME/scripts`
PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin`
# then append less important stuff
PATH=`apppath -c /usr/local/www/offline/devel.fiw/bin`
unsetopt NULL_GLOB
fi
case "`uname -sr`" in case "`uname -sr`" in
Linux*) Linux*)
@ -91,10 +56,55 @@ Linux*)
fi fi
export LANG export LANG
fi fi
# export LC_TIME=de_AT # don't remember what that was for 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 esac
# don't rely on a sane path at this point:
for i in /usr/bin/preppath /usr/local/bin/preppath
do
if [ -x $i ]
then
preppath=$i
break;
fi
done
if [ -n "$preppath" ]
then
# first prepend important stuff - in order of increasing priority:
setopt NULL_GLOB
PATH=`$preppath -c /usr/bin/X11:/usr/games:/usr/contrib/bin`
PATH=`$preppath -c /bin:/usr/bin`
PATH=`$preppath -c /usr/sbin:/sbin`
PATH=`$preppath -c /usr/local/sbin:/usr/local/bin`
`$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin`
`$preppath -c -e -r /usr/lib/go-1.*/bin`
`$preppath -c -e -r /usr/local/go-1.*/bin`
`$preppath -c -e -r $HOME/go/bin`
PATH=`$preppath -c $HOME/scripts`
PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin`
# then append less important stuff
PATH=`apppath -c /usr/local/www/offline/devel.fiw/bin`
unsetopt NULL_GLOB
fi
case "$LANG" in case "$LANG" in
*.iso88591) *.iso88591)
export LESSCHARSET=latin1 export LESSCHARSET=latin1