Fixed and improved network-visualiser scripts

network-visualiser/clean.sh

@@ -15,7 +15,8 @@ msg() {
 
 LOCAL_DIR="$(readlink -f "$(dirname "$0")")"
 if cd "$LOCAL_DIR/catalina"; then
-    rm -f "./logs"/*
+    rm -rf "./logs"
+    rm -rf "./temp"
     rm -rf "./webapps/visualiser"
     rm -rf "./work"
 fi

network-visualiser/start.sh

@@ -21,13 +21,21 @@ fi
 DEFAULT_TOMCAT_HOME="/opt/tomcat"
 if [ -n "$CATALINA_HOME" ]; then
     TOMCAT_HOME="$CATALINA_HOME"
+    if [ -d "$TOMCAT_HOME" ]; then
+        msg "Note: using tomcat home directory '$TOMCAT_HOME'"
+    else
+        abort "Tomcat directory '$TOMCAT_HOME' passed via CATALINA_HOME variable does not exist"
+    fi
 else
-    msg "Note: using default tomcat home directory '$DEFAULT_TOMCAT_HOME'"
     TOMCAT_HOME="$DEFAULT_TOMCAT_HOME"
+    if [ -d "$TOMCAT_HOME" ]; then
+        msg "Note: using default tomcat home directory '$TOMCAT_HOME'"
+    else
+        abort "Default tomcat directory '$TOMCAT_HOME' does not exist. Install tomcat in the default directory or pass a custom directory via CATALINA_HOME variable"
+    fi
 fi
 
 TOMCAT_STARTUP="$TOMCAT_HOME/bin/startup.sh"
-
 if [ ! -f "$TOMCAT_STARTUP" ]; then
     abort "Could not find tomcat startup script '$TOMCAT_STARTUP'"
 fi
@@ -40,6 +48,9 @@ LOCAL_DIR="$(readlink -f "$(dirname "$0")")"
 export SEGRID_HOME="$LOCAL_DIR"
 export CATALINA_BASE="$LOCAL_DIR/catalina"
 
+mkdir -p "$CATALINA_BASE/logs"
+mkdir -p "$CATALINA_BASE/temp"
+
 if "$TOMCAT_STARTUP"; then
     tail -f "$CATALINA_BASE/logs/catalina.out"
 else