From fa5185f70a4d086393f9420f72641686194a8ef4 Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@hjp.at>
Date: Thu, 13 Sep 2018 21:13:15 +0200
Subject: [PATCH 1/5] Use newest go on debian

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

diff --git a/.zshenv b/.zshenv
index fb96585..5781ab5 100644
--- a/.zshenv
+++ b/.zshenv
@@ -57,6 +57,7 @@ then
     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 -r /usr/lib/go-1.*/bin`
     PATH=`$preppath -c $HOME/scripts`
     PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin`
 

From b07fa21a971febc0572f5ba3a7beeca1cdd1cbb0 Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@hjp.at>
Date: Thu, 13 Sep 2018 21:15:57 +0200
Subject: [PATCH 2/5] fix preppath invocation

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

diff --git a/.zshenv b/.zshenv
index 5781ab5..ec1ebd6 100644
--- a/.zshenv
+++ b/.zshenv
@@ -57,7 +57,7 @@ then
     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 -r /usr/lib/go-1.*/bin`
+    `$preppath -c -e -r /usr/lib/go-1.*/bin`
     PATH=`$preppath -c $HOME/scripts`
     PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin`
 

From 472ac6c36f4f87f6328d4ed48a0dbaa8e0421308 Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@wsr.ac.at>
Date: Mon, 17 Sep 2018 16:51:29 +0200
Subject: [PATCH 3/5] Note that .zprofile isn't sourced in X sessions

---
 .zprofile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.zprofile b/.zprofile
index 04c7a35..764e37d 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,8 +1,8 @@
-#
-# $Id: .zprofile,v 1.22 2012-10-19 11:03:15 hjp Exp $
-#
 # this is sourced for login shells after .zshenv but before .zshrc
 #
+# Once upon a tim this was also sourced at the start of an Xsession, but
+# that doesn't seem to be the case for my current debian systems (with
+# lightdm/xfce) any more. So everything set here isn't available in X11.
 umask 022
 
 unset MAILCHECK

From 7d14bb87c08afa75e092a4f3eda0abd467e8ee25 Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@wsr.ac.at>
Date: Tue, 18 Sep 2018 17:06:58 +0200
Subject: [PATCH 4/5] Add jdk 1.10, remove 1.6

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

diff --git a/.zjava b/.zjava
index 6a4eace..73cfa2f 100644
--- a/.zjava
+++ b/.zjava
@@ -6,8 +6,8 @@
 if whence apppath > /dev/null
 then
     for i in \
+        /usr/local/jdk-10.0.1 \
         /usr/local/jdk1.8.0_112 \
-        /usr/local/jre1.6.0_14 \
 	/usr/local/java \
 	/usr/lib/java
     do

From 8c64f8791c3d0190b58f7ccc0fc2c69368f2ea37 Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@wsr.ac.at>
Date: Tue, 18 Sep 2018 17:07:47 +0200
Subject: [PATCH 5/5] Remove OpenXchange

---
 .zjava | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.zjava b/.zjava
index 73cfa2f..4134b47 100644
--- a/.zjava
+++ b/.zjava
@@ -62,13 +62,4 @@ then
 	fi
     done
 
-    for i in /usr/local/openxchange
-    do
-	if [ -d "$i" ]
-	then
-	    export OX_HOME="$i"
-	    PATH=$(apppath "$i/bin" "$i/sbin")
-	    break;
-	fi
-    done
 fi