Mirrors/docker-minecraft-server
2
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server synced 2024-11-10 14:24:28 +00:00
Code Issues Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/start-spiget
View file

@ -101,13 +101,13 @@ downloadResourceFromSpiget() {
log "ERROR: failed to retrieve file type of resource $resource"
exit 1
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"
extract "$outfile" /data/plugins
rm "$outfile"
elif containsPlugin "${outfile}"; then
log "Moving resource ${resource} into plugins"
mv "$outfile" /data/plugins
else
log "ERROR: file for resource ${resource} has an unexpected file type: ${fileType}"
exit 2

2
tests/setuponlytests/spiget/docker-compose.yml
View file

@ -8,6 +8,6 @@ services:
EULA: "TRUE"
SETUP_ONLY: "TRUE"
TYPE: PAPER
SPIGET_RESOURCES: "34315,3836,6245,2124"
SPIGET_RESOURCES: "34315,3836,6245,2124,88135"
volumes:
- ./data:/data

1
tests/setuponlytests/spiget/verify.sh
View file

@ -1,4 +1,5 @@
mc-image-helper assert fileExists plugins/3836.jar
mc-image-helper assert fileExists plugins/34315.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