Work around broken globbing

This commit is contained in:
paul 2020-08-22 17:30:18 +02:00 committed by stratholme
parent d63ecf49af
commit 2eaeba4702
2 changed files with 2 additions and 2 deletions

View file

@ -25,7 +25,7 @@ WORKDIR $INSTDIR
RUN ( wget -O ${InstallerJar} ${ForgeUrl1} || wget -O ${InstallerJar} ${ForgeUrl2} ) && \ RUN ( wget -O ${InstallerJar} ${ForgeUrl1} || wget -O ${InstallerJar} ${ForgeUrl2} ) && \
echo "eula=true" > eula.txt && \ echo "eula=true" > eula.txt && \
java -jar ./${InstallerJar} --installServer && rm -f ${InstallerJar} && \ 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 COPY entrypoint.sh /usr/bin

View file

@ -12,7 +12,7 @@ rmln() {
rmln "$INSTDIR/forge.jar" "$RUNDIR/forge.jar" rmln "$INSTDIR/forge.jar" "$RUNDIR/forge.jar"
rmln "$INSTDIR/libraries" "$RUNDIR/libraries" 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" rmln "$INSTDIR/eula.txt" "$RUNDIR/eula.txt"
( echo "MINECRAFT=${MINECRAFT}"; echo "FORGE=${FORGE}" ) > $RUNDIR/version.info ( echo "MINECRAFT=${MINECRAFT}"; echo "FORGE=${FORGE}" ) > $RUNDIR/version.info