Merge branch 'wsr'

.gitconfig

@@ -1,6 +1,6 @@
 [user]
 	name = Peter J. Holzer
-	email = hjp@hjp.at
+	email = hjp@wsr.ac.at
 [alias]
 	co = checkout
 	ci = commit
@@ -10,4 +10,8 @@
 	type = cat-file -t
 	dump = cat-file -p
 [push]
-	default = simple
+        # 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

.vim/colors/hjp.vim

@@ -24,7 +24,13 @@ hi PreProc    term=underline            ctermfg=Magenta   ctermbg=253
 hi Search term=reverse cterm=NONE ctermfg=White ctermbg=Cyan gui=NONE guifg=Black guibg=Cyan
 hi Special    term=bold                 ctermfg=DarkMagenta ctermbg=253             guifg=Magenta
 hi Statement term=bold ctermfg=DarkBlue gui=NONE guifg=Brown
-hi StatusLine term=bold,reverse cterm=NONE ctermfg=Yellow ctermbg=DarkGray gui=NONE guifg=Yellow guibg=DarkGray
+
+" Use color 226 (pale yellow) instead of the default yellow, because I refined
+" the default yellow to orange for better contrast against a light background
+" (there are way too many command line tools that assume a black background and
+" lightlight stuff in yellow).
+hi StatusLine term=bold,reverse cterm=NONE ctermfg=226 ctermbg=DarkGray gui=NONE guifg=Yellow guibg=DarkGray
+
 hi String     term=bold                    ctermfg=90     ctermbg=NONE              guifg=Magenta
 hi Tag term=bold ctermfg=DarkGreen guifg=DarkGreen
 hi Todo term=standout ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow

.zshenv

@@ -181,14 +181,6 @@ then
     limit coredumpsize 64M
 fi
 
-case "$FQDN" in
-   teal.hjp.at)
-	export MAIL=$HOME/Maildir
-	;;
-   *.wsr.ac.at)
-	;;
-esac
-
 case "$FQDN" in
    *.hjp.at)
 	export NNTPSERVER=news.luga.at
@@ -198,16 +190,11 @@ case "$FQDN" in
 	;;
 esac
 
-
-
 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`
 	;;
-    mri.wsr.ac.at|hrunkner.hjp.at)
+    hrunkner.hjp.at)
         export LD_LIBRARY_PATH=`apppath -v LD_LIBRARY_PATH /usr/lib/jni`
         ;;
    *.wsr.ac.at)
@@ -250,12 +237,6 @@ case "$FQDN" in
    pashkan.wsr.ac.at)
 	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)
 	export WZRP_CONN=~/.dbi/fiwssd
 	;;
@@ -269,9 +250,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`
 	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
 
 case "$FQDN" in
@@ -283,6 +261,9 @@ case "$FQDN" in
 	export PGHOST=$FQDN
         export PGUSER=fiw
 	;;
+    teleute.wsr.ac.at)
+	export PGHOST=wds.wifo.ac.at
+        ;;
 esac
 
 case "$FQDN" in
@@ -305,7 +286,7 @@ then
 fi
 
 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"
 	;;
 esac
@@ -316,8 +297,10 @@ then
 fi
 
 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
 
@@ -328,3 +311,10 @@ case "$FQDN" in
 	;;
 esac
 
+if [ -d /etc/profile.d ]
+then
+    for i in /etc/profile.d/*.sh
+    do
+        . $i
+    done
+fi

.zshrc

@@ -1,8 +1,7 @@
-echo ".zshrc: LANG=$LANG"
 umask 022
 bindkey -v
 
-REPORTTIME=1
+REPORTTIME=2
 
 alias	amke=make
 alias	a=alias

GNUmakefile

@@ -7,8 +7,6 @@ ALLSRC = \
 	.zshenv \
 	.zshrc \
 	.gitconfig \
-        .vim/ \
-        .vim/colors/ \
         .vim/colors/hjp.vim \
         .vimrc \
 
@@ -22,10 +20,7 @@ echo:
 	echo $(ALLDST)
 
 $(HOME)/%: %
-	cp $^ $@
+	install -D $^ $@
-
-$(HOME)/%/:
-	mkdir $@
 
 diff:
 	for i in $(ALLSRC); do diff -u $(HOME)/$$i $$i; done