Constrain GENERIC_PACK base detection depth (#1528)

scripts/start-deployForge

@@ -8,7 +8,7 @@ isDebugging && set -x
 
 get_installer() {
   if [[ -z $FORGE_INSTALLER_URL ]]; then
-    log "Downloading $normForgeVersion"
+    log "Downloading Forge Installer $normForgeVersion"
 
     forgeFileNames="
     $shortForgeVersion/forge-$shortForgeVersion-installer.jar
@@ -25,7 +25,7 @@ get_installer() {
     log "Unable to locate usable URL for $normForgeVersion"
     exit 2
  else
-    log "Downloading $FORGE_INSTALLER_URL ..."
+    log "Downloading Forge Installer from $FORGE_INSTALLER_URL ..."
     if ! get -o "$FORGE_INSTALLER" "$FORGE_INSTALLER_URL"; then
       log "Failed to download from given location $FORGE_INSTALLER_URL"
       exit 2

scripts/start-finalExec

@@ -122,8 +122,8 @@ if [ -n "$JVM_DD_OPTS" ]; then
       done
 fi
 
-if isTrue ${ENABLE_JMX}; then
-  : ${JMX_PORT:=7091}
+if isTrue "${ENABLE_JMX}"; then
+  : "${JMX_PORT:=7091}"
   JVM_OPTS="${JVM_OPTS}
   -Dcom.sun.management.jmxremote.local.only=false
   -Dcom.sun.management.jmxremote.port=${JMX_PORT}

scripts/start-setupModpack

@@ -216,18 +216,20 @@ if [[ "${GENERIC_PACKS}" ]]; then
   elif isTrue "${FORCE_GENERIC_PACK_UPDATE}" || ! checkSum "${sum_file}"; then
     log "Generic pack(s) are out of date. Re-applying..."
 
-    base_dir=/tmp/generic_pack_base
-    mkdir -p ${base_dir}
+    original_base_dir=/data/.tmp/generic_pack_base
+    base_dir=$original_base_dir
+    rm -rf "${base_dir}"
+    mkdir -p "${base_dir}"
     for pack in "${packFiles[@]}"; do
       isDebugging && ls -l "${pack}"
       extract "${pack}" "${base_dir}"
     done
 
     # recalculate the actual base directory of content
-    base_dir=$(find "$base_dir" -type d \( -name mods -o -name plugins -o -name config \) -printf '%h' -quit)
+    base_dir=$(find "$base_dir" -maxdepth 3 -type d \( -name mods -o -name plugins -o -name config \) -printf '%h' -quit)
     if [[ ! $base_dir ]]; then
       log "ERROR: Unable to find content base of generic packs ${GENERIC_PACKS}. Directories:"
-      find /tmp/generic_pack_base -type d -printf '  - %P\n'
+      find $original_base_dir -maxdepth 3 -type d -printf '  - %P\n'
       exit 1
     fi
 
@@ -246,7 +248,7 @@ if [[ "${GENERIC_PACKS}" ]]; then
 
     log "Applying generic pack ..."
     cp -R -f "${base_dir}"/* /data
-    rm -rf /tmp/generic_pack_base
+    rm -rf $original_base_dir
 
     log "Saving generic pack(s) checksum"
     sha1sum "${packFiles[@]}" > "${sum_file}"