Merge branch 'master' into hjp

This commit is contained in:
Peter J. Holzer 2020-04-16 22:34:30 +02:00
commit 985b8edd6f
1 changed files with 0 additions and 88 deletions

88
.zshenv
View File

@ -69,34 +69,6 @@ then
unsetopt NULL_GLOB unsetopt NULL_GLOB
fi 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*)
export LC_COLLATE=POSIX export LC_COLLATE=POSIX
@ -191,23 +163,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/ ]
@ -237,36 +194,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
;; ;;
@ -278,26 +205,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" ]