Merge pull request #4 from reprostat/custombase

GUACAMOLE-2114: fix pre-configured GUACAMOLE_HOME

Author: tiborauer

guacamole-docker/entrypoint.d/100-generate-guacamole-home.sh

@@ -82,7 +82,8 @@ echo "Using GUACAMOLE_HOME: $GUACAMOLE_HOME"
 if [[ "$(ls -A $GUACAMOLE_HOME)" ]]; then
     if [[ -e $GUACAMOLE_HOME/guacamole.properties ]]; then
         echo "Warning: GUACAMOLE_HOME seems to be already configured"
-        return
+        export SKIP_GUACAMOLE_HOME=1
+        return 0
     else
         echo "Warning: GUACAMOLE_HOME is not empty, but does not contain a guacamole.properties file."
         echo "         The contents of GUACAMOLE_HOME will be erased."

guacamole-docker/entrypoint.d/500-generate-tomcat-catalina-base.sh

@@ -53,7 +53,7 @@ echo "Using CATALINA_BASE: $CATALINA_BASE"
 if [[ "$(ls -A $CATALINA_BASE)" ]]; then
     if [[ -e $CATALINA_BASE/conf/catalina.properties ]]; then
         echo "Warning: CATALINA_BASE seems to be already configured"
-        return
+        return 0
     else
         echo "Warning: CATALINA_BASE is not empty, but does not contain a conf/catalina.properties file."
         echo "         The contents of CATALINA_BASE will be erased."

guacamole-docker/entrypoint.d/700-configure-features.sh

@@ -44,6 +44,11 @@
 ##     Zero if the feature associated with the given environment variable
 ##     prefix is enabled, non-zero otherwise.
 ##
+if [[ ! -z "$SKIP_GUACAMOLE_HOME" && "$SKIP_GUACAMOLE_HOME" == 1 ]]; then
+    echo "Skipping feature configuration due to pre-configured GUACAMOLE_HOME."
+    return 0
+fi
+
 is_feature_enabled() {
 
     local VAR_BASE="$1"