From 23b275173bbbe3bf49f6d24fbc2cfb3b78c58d9e Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@wsr.ac.at>
Date: Thu, 14 Dec 2017 13:11:23 +0100
Subject: [PATCH 1/4] Set push.default to current

---
 .gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index d742a30..1d62cb0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -10,4 +10,4 @@
 	type = cat-file -t
 	dump = cat-file -p
 [push]
-	default = upstream
+	default = current

From edbd930f448e7caec04cb403ff6400ff16ddfff4 Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@wsr.ac.at>
Date: Thu, 14 Dec 2017 15:28:05 +0100
Subject: [PATCH 2/4] Source /etc/profile.d/*.sh if it exists

---
 .zshenv | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.zshenv b/.zshenv
index 1651b32..10f5b61 100644
--- a/.zshenv
+++ b/.zshenv
@@ -331,3 +331,10 @@ case "$FQDN" in
 	;;
 esac
 
+if [ -d /etc/profile.d ]
+then
+    for i in /etc/profile.d/*.sh
+    do
+        . $i
+    done
+fi

From beba1dff3c608a4dc4bd6cd9bbe2aca62c8f49d0 Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@wsr.ac.at>
Date: Thu, 14 Dec 2017 15:32:18 +0100
Subject: [PATCH 3/4] Remove references to obsolete host teal.hjp.at

---
 .zshenv | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.zshenv b/.zshenv
index 10f5b61..ae30a07 100644
--- a/.zshenv
+++ b/.zshenv
@@ -184,14 +184,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
@@ -204,7 +196,7 @@ 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)
+   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)
 	export LD_LIBRARY_PATH=/usr/local/lib
 	;;
    tanstaafl.wsr.ac.at|pashkan.wsr.ac.at)

From eecf9741fb97412d755435c8b48d19cbf2f22cda Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@wsr.ac.at>
Date: Thu, 14 Dec 2017 15:37:14 +0100
Subject: [PATCH 4/4] Remove references to more obsolete hosts

---
 .zshenv | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/.zshenv b/.zshenv
index ae30a07..dd2fef2 100644
--- a/.zshenv
+++ b/.zshenv
@@ -193,16 +193,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)
-	export LD_LIBRARY_PATH=/usr/local/lib
-	;;
-   tanstaafl.wsr.ac.at|pashkan.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)
@@ -245,12 +240,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
 	;;
@@ -264,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`
 	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
@@ -300,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
@@ -310,13 +296,6 @@ then
     source ~/perl5/perlbrew/etc/bashrc
 fi
 
-case "$FQDN" in
-   lemy.wsr.ac.at)
-        $(preppath -e -v PYTHONPATH -c ~/etc/wds)
-	;;
-esac
-
-
 case "$FQDN" in
    *.wsr.ac.at)
         export GIT_AUTHOR_EMAIL="$LOGNAME@wsr.ac.at"