Merge branch 'master' into pre/1.13

This commit is contained in:
Zach Brown 2018-08-24 11:57:11 -04:00
commit 12cf81881c
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
5 changed files with 186 additions and 2 deletions

View file

@ -34,9 +34,10 @@ fi
# set a symlink to current
currentlink="$workdir/Minecraft/current"
if ([ ! -e "$currentlink" ] || [ -L "$currentlink" ]) && [ "$windows" == "false" ]; then
set +e
echo "Pointing $currentlink to $minecraftversion"
rm -rf "$currentlink"
ln -sfn "$minecraftversion" "$currentlink"
rm -rf "$currentlink" || true
ln -sfn "$minecraftversion" "$currentlink" || echo "Failed to set current symlink"
fi
)