core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a more general method of aliasing md5sum 

Rather than checking the platform or operating system, simply check if
the command exists. If the check fails, check if the md5 command exists.
If that fails as well, cancel the build script. Otherwise, assign the
alias as before.
This commit is contained in:
Kyle Wood 2018-02-23 18:58:45 -06:00
parent 34e91b6e40
commit 1b2c45f9d0
No known key found for this signature in database
GPG Key ID: D74E80413907E2D3
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/remap.sh
View File

@ -24,11 +24,16 @@ if [ ! -f "$jarpath.jar" ]; then
fi fi
# OS X & FreeBSD don't have md5sum, just md5 -r # OS X & FreeBSD don't have md5sum, just md5 -r
if [[ "$OSTYPE" == "darwin"* || "$(uname)" == "FreeBSD" ]]; then command -v md5sum >/dev/null 2>&1 || {
shopt -s expand_aliases command -v md5 >/dev/null 2>&1 && {
alias md5sum='md5 -r' shopt -s expand_aliases
echo "Using an alias for md5sum on macOS and/or FreeBSD" alias md5sum='md5 -r'
fi echo "md5sum command not found, using an alias instead"
} || {
echo >&2 "No md5sum or md5 command found"
exit 1
}
}
checksum=$(md5sum "$jarpath.jar" | cut -d ' ' -f 1) checksum=$(md5sum "$jarpath.jar" | cut -d ' ' -f 1)
if [ "$checksum" != "$minecrafthash" ]; then if [ "$checksum" != "$minecrafthash" ]; then