Fixed bug on setting JAVA_HOME in collector and network-visualiser

collector/run-collector.sh

@@ -27,7 +27,7 @@ if ! [ -n "${LD_LIBRARY_PATH}" ]; then
     LD_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu"
 fi
 if ! [ -n "${JAVA_HOME}" ]; then
-    JAVA_HOME="$(dirname "$(dirname "$(dirname "$(readlink -v -e "$(which java)")")")")"
+    JAVA_HOME="$(readlink -v -e "$(which java)" | sed 's:bin/java::')"
 fi
 
 java ${JVM_OPTS} -Dlogback.configurationFile=${LOGBACK_FILE}\

network-visualiser/start.sh

@@ -40,8 +40,8 @@ if [ ! -f "$TOMCAT_STARTUP" ]; then
     abort "Could not find tomcat startup script '$TOMCAT_STARTUP'"
 fi
 
-if [ -z "$JRE_HOME" -a -z "$JAVA_HOME" ]; then
-    export JRE_HOME="$(dirname "$(dirname "$(dirname "$(readlink -v -e "$JAVA_EXEC")")")")"
+if ! [ -n "$JRE_HOME" -o -n "$JAVA_HOME" ]; then
+    export JRE_HOME="$(readlink -v -e "$(which java)" | sed 's:bin/java::')"
 fi
 
 LOCAL_DIR="$(readlink -f "$(dirname "$0")")"