From f4fc9382ca47810a19cda0a6e9ed9e1f626d20cd Mon Sep 17 00:00:00 2001 From: LB Date: Tue, 1 Sep 2026 17:58:25 -0400 Subject: [PATCH] Prune CurseForge libraries/mods using relative find paths (#4259) Co-authored-by: LCB --- scripts/start-deployCF | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/start-deployCF b/scripts/start-deployCF index cf714772..94ca9c1e 100755 --- a/scripts/start-deployCF +++ b/scripts/start-deployCF @@ -127,7 +127,7 @@ if ! isTrue "${USE_MODPACK_START_SCRIPT:-true}"; then echo "${FTB_SERVER_MOD}" > $installMarker fi - SERVER=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print) + SERVER=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print) if [[ -z "${SERVER}" || ! -f "${SERVER}" ]]; then logError "Unable to locate installed forge server jar" isDebugging && find "${FTB_BASE_DIR}" -name "forge*.jar" @@ -200,7 +200,7 @@ if [[ ! $startScript ]]; then # no, then look for a forge jar to run # Allow up to 2 levels since some modpacks have a top-level directory named for the modpack - forgeJar=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print) + forgeJar=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print) if [[ "$forgeJar" ]]; then FTB_BASE_DIR=$(dirname "${forgeJar}") export FTB_BASE_DIR