Merge branch 'multiarch' into multiarch-latest

This commit is contained in:
Geoff Bourne 2020-12-28 11:44:41 -06:00
commit de082d0fb2
2 changed files with 3 additions and 2 deletions

View file

@ -7,6 +7,7 @@ RUN apt-get update \
apt-get install -y \
imagemagick \
gosu \
sudo \
curl wget \
jq \
dos2unix \

View file

@ -48,8 +48,8 @@ else
fi
isDebugging && cat version.json
forgeVersion=$(jq -r '.targets[] | select(.name == "forge") | .version' version.json)
mcVersion=$(jq -r '.targets[] | select(.name == "minecraft") | .version' version.json)
forgeVersion=$(jq -r '.targets|unique[] | select(.name == "forge") | .version' version.json)
mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json)
variants=(
forge-${mcVersion}-${forgeVersion}.jar