Fixed REMOVE_OLD_MODS when directories not present

#851
This commit is contained in:
Geoff Bourne committed 2021-04-28 16:29:47 -05:00
1 parent cfb2739cd9
commit 7164d2b885
3 files changed
+9 -2

No files matched your search

+2 -1
View File
@@ -12,7 +12,8 @@ CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}
# Remove old mods/plugins # Remove old mods/plugins
if isTrue ${REMOVE_OLD_MODS:-false}; then if isTrue ${REMOVE_OLD_MODS:-false}; then
find /data/mods /data/plugins -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE}" -delete removeOldMods /data/mods
removeOldMods /data/plugins
fi fi
# If supplied with a URL for a modpack (simple zip of jars), download it and unpack # If supplied with a URL for a modpack (simple zip of jars), download it and unpack
+1 -1
View File
@@ -47,7 +47,7 @@ getResourceFromSpiget() {
if [[ ${SPIGET_RESOURCES} ]]; then if [[ ${SPIGET_RESOURCES} ]]; then
if isTrue ${REMOVE_OLD_MODS:-false}; then if isTrue ${REMOVE_OLD_MODS:-false}; then
rm -rf /data/plugins removeOldMods /data/plugins
REMOVE_OLD_MODS=false REMOVE_OLD_MODS=false
fi fi
+6
View File
@@ -174,3 +174,9 @@ eula=${EULA,,}
exit 2 exit 2
fi fi
} }
function removeOldMods {
if [ -d "$1" ]; then
find "$1" -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE}" -delete
fi
}