Commit 6aaed2d 1 parent 15c2e21 commit 6aaed2d Copy full SHA for 6aaed2d
File tree 4 files changed +21
-0
lines changed
4 files changed +21
-0
lines changed Original file line number Diff line number Diff line change @@ -24,6 +24,8 @@ resultsFile=/data/.install-curseforge.env
24
24
25
25
isDebugging && set -x
26
26
27
+ ensureRemoveAllModsOff " MOD_PLATFORM=AUTO_CURSEFORGE"
28
+
27
29
args=(
28
30
--results-file=" $resultsFile "
29
31
)
Original file line number Diff line number Diff line change 19
19
20
20
isDebugging && set -x
21
21
22
+ ensureRemoveAllModsOff " MOD_PLATFORM=MODRINTH"
23
+
22
24
args=(
23
25
--results-file=" $resultsFile "
24
26
--project=" ${MODRINTH_MODPACK} "
Original file line number Diff line number Diff line change 83
83
function handleListings() {
84
84
if usesMods && usesPlugins; then
85
85
if [[ " $MODS " ]]; then
86
+
87
+ ensureRemoveAllModsOff " MODS is set"
88
+
86
89
mkdir -p " $MODS_OUT_DIR "
87
90
mc-image-helper mcopy \
88
91
--glob=* .jar \
@@ -91,6 +94,7 @@ function handleListings() {
91
94
" $MODS "
92
95
fi
93
96
if [[ " $PLUGINS " ]]; then
97
+ ensureRemoveAllModsOff " PLUGINS is set"
94
98
mkdir -p " $PLUGINS_OUT_DIR "
95
99
mc-image-helper mcopy \
96
100
--glob=* .jar \
@@ -100,6 +104,7 @@ function handleListings() {
100
104
fi
101
105
102
106
if [[ " $MODS_FILE " ]]; then
107
+ ensureRemoveAllModsOff " MODS_FILE is set"
103
108
mkdir -p " $MODS_OUT_DIR "
104
109
mc-image-helper mcopy \
105
110
--file-is-listing \
@@ -108,6 +113,7 @@ function handleListings() {
108
113
" $MODS_FILE "
109
114
fi
110
115
if [[ " $PLUGINS_FILE " ]]; then
116
+ ensureRemoveAllModsOff " PLUGINS_FILE is set"
111
117
mkdir -p " $PLUGINS_OUT_DIR "
112
118
mc-image-helper mcopy \
113
119
--file-is-listing \
@@ -123,6 +129,7 @@ function handleListings() {
123
129
fi
124
130
125
131
if [[ " $MODS " || " $PLUGINS " ]]; then
132
+ ensureRemoveAllModsOff " MODS or PLUGINS is set"
126
133
mkdir -p " $outDir "
127
134
mc-image-helper mcopy \
128
135
--glob=* .jar \
@@ -132,6 +139,7 @@ function handleListings() {
132
139
fi
133
140
134
141
if [[ " $MODS_FILE " || " $PLUGINS_FILE " ]]; then
142
+ ensureRemoveAllModsOff " MODS_FILE or PLUGINS_FILE is set"
135
143
mkdir -p " $outDir "
136
144
mc-image-helper mcopy \
137
145
--file-is-listing \
Original file line number Diff line number Diff line change @@ -347,4 +347,13 @@ function resolveFamily() {
347
347
;;
348
348
esac
349
349
export FAMILY
350
+ }
351
+
352
+ function ensureRemoveAllModsOff() {
353
+ reason=${1?}
354
+
355
+ if isTrue " ${REMOVE_OLD_MODS:- false} " ; then
356
+ log " WARNING using REMOVE_OLDS_MODS interferes with $reason -- it is now disabled"
357
+ REMOVE_OLD_MODS=false
358
+ fi
350
359
}
You can’t perform that action at this time.
0 commit comments