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

Merge branch 'wsr' of https://github.com/hjp/dot into wsr

This commit is contained in:
Peter J. Holzer 2018-01-22 18:41:36 +01:00 committed by Peter J. Holzer
parent 5899e9f365 9db9d87419
commit 22b388d739
2 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitconfig
View File

@ -10,4 +10,8 @@
type = cat-file -t type = cat-file -t
dump = cat-file -p dump = cat-file -p
[push] [push]
default = upstream # 1.7.1: nothing, matching, tracking, current
# 2.11.0: nothing, matching, upstream, current, simple
# nothing is inconvenient, matching is dangerous.
# current is only compatible remaining option.
default = current

41
.zshenv
View File

@ -184,14 +184,6 @@ then
limit coredumpsize 64M limit coredumpsize 64M
fi fi
case "$FQDN" in
teal.hjp.at)
export MAIL=$HOME/Maildir
;;
*.wsr.ac.at)
;;
esac
case "$FQDN" in case "$FQDN" in
*.hjp.at) *.hjp.at)
export NNTPSERVER=news.luga.at export NNTPSERVER=news.luga.at
@ -201,16 +193,11 @@ case "$FQDN" in
;; ;;
esac esac
case "$FQDN" in case "$FQDN" in
wsrgeh.wsr.ac.at|coney.wsr.ac.at|bernon.wsr.ac.at|ariel.wsr.ac.at|chthon.h.hjp.at|posbi.wsr.ac.at|braveheart.wsr.ac.at|dialog.wsr.ac.at|samkar.wsr.ac.at|yoyo.hjp.at|yoyo.wsr.ac.at|localhost.localdomain|teal.hjp.at) pashkan.wsr.ac.at)
export LD_LIBRARY_PATH=/usr/local/lib
;;
tanstaafl.wsr.ac.at|pashkan.wsr.ac.at)
export LD_LIBRARY_PATH=`preppath -v LD_LIBRARY_PATH /usr/local/lib` export LD_LIBRARY_PATH=`preppath -v LD_LIBRARY_PATH /usr/local/lib`
;; ;;
mri.wsr.ac.at|hrunkner.hjp.at) hrunkner.hjp.at)
export LD_LIBRARY_PATH=`apppath -v LD_LIBRARY_PATH /usr/lib/jni` export LD_LIBRARY_PATH=`apppath -v LD_LIBRARY_PATH /usr/lib/jni`
;; ;;
*.wsr.ac.at) *.wsr.ac.at)
@ -253,12 +240,6 @@ case "$FQDN" in
pashkan.wsr.ac.at) pashkan.wsr.ac.at)
export WZRP_CONN=~/.dbi/fiwdevel export WZRP_CONN=~/.dbi/fiwdevel
;; ;;
mri.wsr.ac.at)
export WZRP_CONN=~/.dbi/fiwdevel
;;
melbar.wsr.ac.at)
export WZRP_CONN=~/.dbi/fiwdevel
;;
algernon.wsr.ac.at) algernon.wsr.ac.at)
export WZRP_CONN=~/.dbi/fiwssd export WZRP_CONN=~/.dbi/fiwssd
;; ;;
@ -272,9 +253,6 @@ case "$FQDN" in
export PERL5LIB=`apppath -c -v PERL5LIB ~/lib/perl5 /usr/local/www/offline/$USER.fiw/lib/perl5 /usr/local/www/offline/dal.fiw/lib/perl5` 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` PATH=`apppath -c /usr/local/www/offline/$USER.fiw/bin /usr/local/www/offline/dal.fiw/bin`
;; ;;
mri.wsr.ac.at)
`apppath -e -v PERL5LIB /home/hjp/wrk/wds/Software/Import/wds-import`
;;
esac esac
case "$FQDN" in case "$FQDN" in
@ -311,7 +289,7 @@ then
fi fi
case "$FQDN" in case "$FQDN" in
mri.wsr.ac.at) tsimri.wsr.ac.at)
export GET_PASS_FILES="/home/hjp/wrk/admin/info/pwd_work.gpg /home/hjp/Notes/pw.gpg" export GET_PASS_FILES="/home/hjp/wrk/admin/info/pwd_work.gpg /home/hjp/Notes/pw.gpg"
;; ;;
esac esac
@ -322,8 +300,10 @@ then
fi fi
case "$FQDN" in case "$FQDN" in
lemy.wsr.ac.at) oro.wsr.ac.at)
$(preppath -e -v PYTHONPATH -c ~/etc/wds) 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 esac
@ -334,3 +314,10 @@ case "$FQDN" in
;; ;;
esac esac
if [ -d /etc/profile.d ]
then
for i in /etc/profile.d/*.sh
do
. $i
done
fi