amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-05-20 19:05:23 +00:00
Code Issues Projects Releases Wiki Activity

Correct spiget handling of jars that contain jars (#1462)

Browse Source
This commit is contained in:
Geoff Bourne
2022-04-09 22:02:20 -05:00
committed by GitHub
parent 513492192b
commit 4af80debe2
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/start-spiget
+4 -4
View File
@@ -101,13 +101,13 @@ downloadResourceFromSpiget() {
log "ERROR: failed to retrieve file type of resource $resource" log "ERROR: failed to retrieve file type of resource $resource"
exit 1 exit 1
fi fi
if containsJars "${outfile}"; then if containsPlugin "${outfile}"; then
log "Moving resource ${resource} into plugins"
mv "$outfile" /data/plugins
elif containsJars "${outfile}"; then
log "Extracting contents of resource ${resource} into plugins" log "Extracting contents of resource ${resource} into plugins"
extract "$outfile" /data/plugins extract "$outfile" /data/plugins
rm "$outfile" rm "$outfile"
elif containsPlugin "${outfile}"; then
log "Moving resource ${resource} into plugins"
mv "$outfile" /data/plugins
else else
log "ERROR: file for resource ${resource} has an unexpected file type: ${fileType}" log "ERROR: file for resource ${resource} has an unexpected file type: ${fileType}"
exit 2 exit 2
tests/setuponlytests/spiget/docker-compose.yml
+1 -1
View File
@@ -8,6 +8,6 @@ services:
EULA: "TRUE" EULA: "TRUE"
SETUP_ONLY: "TRUE" SETUP_ONLY: "TRUE"
TYPE: PAPER TYPE: PAPER
SPIGET_RESOURCES: "34315,3836,6245,2124" SPIGET_RESOURCES: "34315,3836,6245,2124,88135"
volumes: volumes:
- ./data:/data - ./data:/data
tests/setuponlytests/spiget/verify.sh
+1
View File
@@ -1,4 +1,5 @@
mc-image-helper assert fileExists plugins/3836.jar mc-image-helper assert fileExists plugins/3836.jar
mc-image-helper assert fileExists plugins/34315.jar mc-image-helper assert fileExists plugins/34315.jar
mc-image-helper assert fileExists plugins/6245.jar mc-image-helper assert fileExists plugins/6245.jar
mc-image-helper assert fileExists plugins/88135.jar
mc-image-helper assert fileExists plugins/SkinsRestorer.jar mc-image-helper assert fileExists plugins/SkinsRestorer.jar