Merge branch 'master' into wsr_shared

This commit is contained in:
Peter J. Holzer 2020-10-28 12:29:37 +01:00
commit 1099089f27
2 changed files with 51 additions and 135 deletions

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

180
.zshenv
View File

@ -27,76 +27,12 @@ export PGPPATH=~/.pgp
export PARINIT=q1 export PARINIT=q1
export PARBODY=_A_a export PARBODY=_A_a
export DEBEMAIL=hjp@hjp.at export DEBEMAIL=hjp@hjp.at
export DEB_SIGN_KEYID=12FE285D 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 /usr/local/node-v8.9.4-linux-x64/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
if [ -r /etc/MANPATH ]
then
MANPATH=`cat /etc/MANPATH`:$MANPATH
else
ALL_PATH=/usr/local/qmail/man:/usr/man:/usr/local/man:/usr/X11R6/man:/usr/share/man:/usr/local/pgsql/man:/var/qmail/man:/usr/local/rrdtool-1.0.35/man
NEW_PATH=""
for i in ${(s/:/)ALL_PATH}
do
if test -d "$i"
then
case "$NEW_PATH" in
$i:*|*:$i|*:$i:*) ;;
*)
if test -z "$NEW_PATH"
then
NEW_PATH=$i
else
NEW_PATH=$NEW_PATH:$i
fi
esac
fi
done
MANPATH=$NEW_PATH
fi
export MANPATH
case "`uname -sr`" in case "`uname -sr`" in
Linux*) Linux*)
@ -120,10 +56,56 @@ 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 /usr/local/node-v8.9.4-linux-x64/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
@ -192,23 +174,8 @@ case "$FQDN" in
*.hjp.at) *.hjp.at)
export NNTPSERVER=news.luga.at export NNTPSERVER=news.luga.at
;; ;;
*.wsr.ac.at)
export NNTPSERVER=news.wsr.ac.at
;;
esac esac
case "$FQDN" in
pashkan.wsr.ac.at)
export LD_LIBRARY_PATH=`preppath -v LD_LIBRARY_PATH /usr/local/lib`
;;
hrunkner.hjp.at)
export LD_LIBRARY_PATH=`apppath -v LD_LIBRARY_PATH /usr/lib/jni`
;;
*.wsr.ac.at)
;;
esac
export TABLE_DELIMITER='|' export TABLE_DELIMITER='|'
if [ -d /usr/local/pgsql/data/ ] if [ -d /usr/local/pgsql/data/ ]
@ -238,36 +205,6 @@ then
fi fi
case "$FQDN" in case "$FQDN" in
shalmaneser.wsr.ac.at)
export WZRP_CONN=~/.dbi/fiwssd
;;
pashkan.wsr.ac.at)
export WZRP_CONN=~/.dbi/fiwdevel
;;
algernon.wsr.ac.at)
export WZRP_CONN=~/.dbi/fiwssd
;;
enmetena.wsr.ac.at)
export WZRP_CONN=~/.dbi/fiwdevel
;;
esac
case "$FQDN" in
shalmaneser.wsr.ac.at|pashkan.wsr.ac.at)
export PERL5LIB=`apppath -c -v PERL5LIB ~/lib/perl5 /usr/local/www/offline/$USER.fiw/lib/perl5 /usr/local/www/offline/dal.fiw/lib/perl5`
PATH=`apppath -c /usr/local/www/offline/$USER.fiw/bin /usr/local/www/offline/dal.fiw/bin`
;;
esac
case "$FQDN" in
algernon.wsr.ac.at)
export PGHOST=$FQDN
export PGUSER=fiw
;;
pashkan.wsr.ac.at)
export PGHOST=$FQDN
export PGUSER=fiw
;;
teleute.wsr.ac.at) teleute.wsr.ac.at)
export PGHOST=wds.wifo.ac.at export PGHOST=wds.wifo.ac.at
;; ;;
@ -279,26 +216,11 @@ case "$FQDN" in
;; ;;
esac esac
case "$FQDN" in
tsimri.wsr.ac.at)
export GET_PASS_FILES="/home/hjp/wrk/admin/info/pwd_work.gpg /home/hjp/Notes/pw.gpg"
;;
esac
if [ -f ~/perl5/perlbrew/etc/bashrc ] if [ -f ~/perl5/perlbrew/etc/bashrc ]
then then
source ~/perl5/perlbrew/etc/bashrc source ~/perl5/perlbrew/etc/bashrc
fi fi
case "$FQDN" in
oro.wsr.ac.at)
cleansing=~/wrk/wds/Software/WDS/Module/30_CLEANSING
$(preppath -e -v PYTHONPATH -c $cleansing/lib)
$(preppath -e -v PYTHONPATH -c $cleansing/system/app/extraction)
;;
esac
case "$FQDN" in case "$FQDN" in
*.wsr.ac.at) *.wsr.ac.at)
if [ -z "$GIT_AUTHOR_EMAIL" ] if [ -z "$GIT_AUTHOR_EMAIL" ]