aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Weickelt <richard@weickelt.de>2020-05-20 18:49:19 +0200
committerRichard Weickelt <richard@weickelt.de>2020-05-25 20:15:29 +0000
commit495d7767af801c6d7cda0d759b89a18f490359f2 (patch)
treef26165cdbac8e0ae1ae7268b4635b4263929c84f
parenta4efbd5732908f1778d2b36b0db296c9e384dc9a (diff)
Use md5 tool on macOS
The md5sum tool is not available on macOS by default. Travis has it, but most systems do not. There is a md5 tool instead, which can produce compatible output. Change-Id: I64c205757effda85920d10a717ecc70e0dad6c91 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rwxr-xr-xscripts/install-qt.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh
index e52fefce4..be953e77d 100755
--- a/scripts/install-qt.sh
+++ b/scripts/install-qt.sh
@@ -110,6 +110,7 @@ TARGET_PLATFORM=desktop
COMPONENTS=
VERSION=
FORCE_DOWNLOAD=false
+MD5_TOOL=md5sum
case "$OSTYPE" in
*linux*)
@@ -121,6 +122,7 @@ case "$OSTYPE" in
HOST_OS=mac_x64
INSTALL_DIR=/usr/local/Qt
TOOLCHAIN=clang_64
+ MD5_TOOL="md5 -r"
;;
msys)
HOST_OS=windows_x86
@@ -202,8 +204,7 @@ case "$TARGET_PLATFORM" in
;;
esac
-
-HASH=$(echo "${OSTYPE} ${TARGET_PLATFORM} ${TOOLCHAIN} ${VERSION} ${INSTALL_DIR}" | md5sum | head -c 16)
+HASH=$(echo "${OSTYPE} ${TARGET_PLATFORM} ${TOOLCHAIN} ${VERSION} ${INSTALL_DIR}" | ${MD5_TOOL} | head -c 16)
HASH_FILEPATH="${INSTALL_DIR}/${HASH}.manifest"
INSTALLATION_IS_VALID=false
if ! ${FORCE_DOWNLOAD} && [ -f "${HASH_FILEPATH}" ]; then