From 2eaeba4702b08d0e59658ffb314eb439de167119 Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 22 Aug 2020 17:30:18 +0200 Subject: [PATCH] Work around broken globbing --- Dockerfile | 2 +- entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 145b10a..a280fa9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ WORKDIR $INSTDIR RUN ( wget -O ${InstallerJar} ${ForgeUrl1} || wget -O ${InstallerJar} ${ForgeUrl2} ) && \ echo "eula=true" > eula.txt && \ java -jar ./${InstallerJar} --installServer && rm -f ${InstallerJar} && \ - ln -s "forge-${MINECRAFT}-*.jar" forge.jar || exit 2 + ln -s "forge-${MINECRAFT}-${FORGE}.jar" forge.jar || exit 2 COPY entrypoint.sh /usr/bin diff --git a/entrypoint.sh b/entrypoint.sh index f48149c..e43a481 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -12,7 +12,7 @@ rmln() { rmln "$INSTDIR/forge.jar" "$RUNDIR/forge.jar" rmln "$INSTDIR/libraries" "$RUNDIR/libraries" -rmln "$INSTDIR/minecraft_server.$MineVers.jar" "$RUNDIR/minecraft_server.$MineVers.jar" +rmln "$INSTDIR/minecraft_server.$MINECRAFT.jar" "$RUNDIR/minecraft_server.$MINECRAFT.jar" rmln "$INSTDIR/eula.txt" "$RUNDIR/eula.txt" ( echo "MINECRAFT=${MINECRAFT}"; echo "FORGE=${FORGE}" ) > $RUNDIR/version.info