Skip to content

Commit 03f9037

Browse files
authored
Corrected calculation of Canyon download URL (#3226)
1 parent 621bafb commit 03f9037

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

examples/canyon/compose.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
services:
2+
mc:
3+
image: itzg/minecraft-server:java8
4+
environment:
5+
EULA: true
6+
TYPE: canyon
7+
VERSION: b1.7.3
8+
ports:
9+
- "25565:25565"
10+
volumes:
11+
- mc-data:/data
12+
volumes:
13+
mc-data:

scripts/start-deployCanyon

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ githubUrl="https://github.com/KoboDev/SupplyAndDemand/releases/download"
1818
canyonBuildJSON=$(curl -fsSL "${canyonJob}/${CANYON_BUILD}/api/json")
1919

2020
buildRelPath=$(
21-
jq '.artifacts[0].relativePath' <<< "$canyonBuildJSON"
21+
jq -r '.artifacts[0].relativePath' <<< "$canyonBuildJSON"
2222
)
2323
buildNumber=$(
24-
jq '.number'<<< "$canyonBuildJSON"
24+
jq -r '.number'<<< "$canyonBuildJSON"
2525
)
2626
baseName=$(basename "${buildRelPath}")
2727

@@ -50,7 +50,7 @@ if [ ! -f "$SERVER" ]; then
5050
fi
5151
curl -fsSL -o "$SERVER" "$downloadUrl"
5252
if [ ! -f "$SERVER" ]; then
53-
logError "Failed to download from $downloadUrl (status=$?)"
53+
logError "Failed to download from $downloadUrl"
5454
exit 3
5555
fi
5656
fi

0 commit comments

Comments
 (0)