# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1530716580 -7200
# Node ID d683d08cf8e03663677dd7b2cca1893fb90492cb
# Parent  8b961f7d78d924ead32c32ba10af863a73dacb85# Parent  b44844181cf60bf5e835abfb950777e0bffd389b
Automated merge with https://localhost/hg/zsh-env

diff -r b44844181cf6 -r d683d08cf8e0 zshrc-cassiopeia
--- a/zshrc-cassiopeia	Wed Jul 04 17:02:49 2018 +0200
+++ b/zshrc-cassiopeia	Wed Jul 04 17:03:00 2018 +0200
@@ -7,6 +7,7 @@
 . $HOME/.zsh-env/zshrc-bindkey
 . $HOME/.zsh-env/zshrc-docker
 . $HOME/.zsh-env/zshrc-vpn
+. $HOME/.zsh-env/zshrc-ipv6
 . $HOME/.zsh-autoenv/autoenv.zsh
 
 export BUILD_NUMBER=0000
@@ -18,7 +19,7 @@
 #
 # aliases
 #
-alias ant="/opt/eclipse-4.5/plugins/org.apache.ant_1.9.4.v201504302020/bin/ant"
+alias ant="/opt/eclipse-photon/plugins/org.apache.ant_1.10.3.v20180417-1627/bin/ant"
 alias bzip=lbzip2
 alias df="df -h"
 alias env="env | sort | $PAGER"
@@ -26,7 +27,6 @@
 alias ex-install="/home/dirk/Projects/Exentra/Source/rpi/utils/ex-install"
 alias mtail=multitail
 alias ne=neditc
-alias ping="noping -4"
 alias top=htop
 
 #
diff -r b44844181cf6 -r d683d08cf8e0 zshrc-docker
--- a/zshrc-docker	Wed Jul 04 17:02:49 2018 +0200
+++ b/zshrc-docker	Wed Jul 04 17:03:00 2018 +0200
@@ -2,7 +2,8 @@
 # Useful aliases and functions for docker
 #
 
-alias dim="docker images --format 'table {{.Repository}}\t{{.ID}}\t{{.Tag}}'"
+alias dim="docker images --format 'table {{.Repository}}\t{{.Tag}}\t{{.ID}}'"
+alias dims="docker images --format 'table {{.Repository}}\t{{.Tag}}\t{{.ID}}\t{{.Size}}'"
 alias dlf="docker logs -f"
 alias doc="docker-compose"
 alias doker=docker
diff -r b44844181cf6 -r d683d08cf8e0 zshrc-epm
--- a/zshrc-epm	Wed Jul 04 17:02:49 2018 +0200
+++ b/zshrc-epm	Wed Jul 04 17:03:00 2018 +0200
@@ -8,9 +8,12 @@
 
 . /etc/profile.d/exentra.sh
 
-# EPM_LOCATION is set through /etc/profile.d/exentra.sh
-export PS1="%n@${EPM_LOCATION}%# "
-
+# EPM_LOCATION/EX_LOCATION is set through /etc/profile.d/exentra.sh
+if [[ "$EX_LOCATION" != "" ]]; then
+	export PS1="%n@${EX_LOCATION}%# "
+else
+	export PS1="%n@${EPM_LOCATION}%# "
+fi
 alias fw="sudo iptables --line-numbers -vnL"
 alias sex="screen -r exentra"
 alias sue="sudo -u exentra -i"
diff -r b44844181cf6 -r d683d08cf8e0 zshrc-jdk
--- a/zshrc-jdk	Wed Jul 04 17:02:49 2018 +0200
+++ b/zshrc-jdk	Wed Jul 04 17:03:00 2018 +0200
@@ -12,30 +12,14 @@
     java -version
 }
 
-ibmJdk5() {
-    switchJdk "ibm-jdk-bin-1.5"
-}
-
-ibmJdk6() {
-    switchJdk "ibm-jdk-bin-1.6"
-}
-
-jdk14() {
-    switchJdk "sun-jdk-1.4"
-}
-
-jdk5() {
-    switchJdk "sun-jdk-1.5"
-}
-
-jdk6() {
-    switchJdk "sun-jdk-1.6"
-}
-
-jdk7() {
-    switchJdk "oracle-jdk-bin-1.7"
-}
-
 jdk8() {
     switchJdk "oracle-jdk-bin-1.8"
 }
+
+jdk10() {
+    export JAVA_HOME=/opt/jdk-10.0.1
+
+    local new_path=`removeFromPath "jdk"`
+    export PATH="${JAVA_HOME}/bin":"${new_path}"
+    java -version
+}