Ensure datapacks cleanup doesn't remove vanillatweaks (#2262)

notes/.gitignore

@@ -0,0 +1 @@
+/*.bkp

scripts/start-setupDatapack

@@ -2,6 +2,8 @@
 
 set -e -o pipefail
 
+: "${VANILLATWEAKS_FILE:=}"
+: "${VANILLATWEAKS_SHARECODE:=}"
 : "${REMOVE_OLD_DATAPACKS:=false}"
 : "${DATAPACKS_FILE:=}"
 : "${REMOVE_OLD_DATAPACKS_DEPTH:=1} "
@@ -74,4 +76,12 @@ elif [[ "$DATAPACKS_FILE" ]]; then
   fi
 fi
 
+if [[ ${VANILLATWEAKS_FILE} || ${VANILLATWEAKS_SHARECODE} ]]; then
+  mc-image-helper vanillatweaks \
+    --output-directory="/data" \
+    --world-subdir="${LEVEL:-world}" \
+    --share-codes="$VANILLATWEAKS_SHARECODE" \
+    --pack-files="$VANILLATWEAKS_FILE"
+fi
+
 exec "${SCRIPTS:-/}start-setupForgeApiMods" "$@"

scripts/start-setupVanillaTweaks

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e -o pipefail
-
-: "${VANILLATWEAKS_FILE:=}"
-: "${VANILLATWEAKS_SHARECODE:=}"
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-
-if [[ ${VANILLATWEAKS_FILE} || ${VANILLATWEAKS_SHARECODE} ]]; then
-  mc-image-helper vanillatweaks \
-    --output-directory="/data" \
-    --world-subdir="${LEVEL:-world}" \
-    --share-codes="$VANILLATWEAKS_SHARECODE" \
-    --pack-files="$VANILLATWEAKS_FILE"
-fi
-
-exec "${SCRIPTS:-/}start-setupDatapack" "$@"

scripts/start-setupWorld

@@ -48,7 +48,7 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
     count=$(echo "$baseDirs" | wc -l)
     if [[ $count -gt 1 ]]; then
       baseDirsNoSpigotSuffix=$(echo "$baseDirs" | sed -re 's:(_nether|_the_end)/?$::' | sort -u)
-      if [ $(echo "$baseDirsNoSpigotSuffix" | wc -l) -eq 1 ]; then
+      if [ "$(echo "$baseDirsNoSpigotSuffix" | wc -l)" -eq 1 ]; then
         baseDir="$baseDirsNoSpigotSuffix"
         baseName=$(basename "$baseDir")
         log "Found Spigot naming conventions, taking $baseName as main dimension"
@@ -123,4 +123,4 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
   fi
 fi
 
-exec "${SCRIPTS:-/}start-setupVanillaTweaks" "$@"
+exec "${SCRIPTS:-/}start-setupDatapack" "$@"