diff --git a/start-deployCF b/start-deployCF index 1b41ace6..f1b66a32 100644 --- a/start-deployCF +++ b/start-deployCF @@ -60,7 +60,7 @@ if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then mkdir -p ${FTB_BASE_DIR} unzip -o "${FTB_SERVER_MOD}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}' - serverJar=$(find ${FTB_BASE_DIR} -type f -path "*/libraries/*" -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print) + serverJar=$(find ${FTB_BASE_DIR} -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print) if [[ -z "$serverJar" ]]; then if [ -f "${FTB_BASE_DIR}/settings.cfg" ]; then @@ -91,7 +91,7 @@ if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then echo "${FTB_SERVER_MOD}" > $installMarker fi - export SERVER=$(find ${FTB_BASE_DIR} -type f -path "*/libraries/*" -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print) + export SERVER=$(find ${FTB_BASE_DIR} -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print) if [[ -z "${SERVER}" || ! -f "${SERVER}" ]]; then log "ERROR unable to locate installed forge server jar" isDebugging && find ${FTB_BASE_DIR} -name "forge*.jar"