From 3bcc909cbb6e845da3d776194cbeea6ac0dce3e5 Mon Sep 17 00:00:00 2001 From: Encolpe DEGOUTE Date: Thu, 6 Dec 2018 15:07:58 +0100 Subject: [PATCH] Fix Qt version check The old expression wasn't working for Qt 5.11.x --- linuxdeploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linuxdeploy.sh b/linuxdeploy.sh index b984b7c9d7..e4cb8ba095 100755 --- a/linuxdeploy.sh +++ b/linuxdeploy.sh @@ -154,13 +154,13 @@ echo "Copyright 2006-2018 Raphael A. Silva " # Identifying System Qt version if [ -e "$QMAKE_ROOT/$QMAKE_CMD" ]; then - QT_VER_1=`$QMAKE_ROOT/$QMAKE_CMD --version | grep --color=never -m 1 -o '[0-9].[0-9].[0-9]'` + QT_VER_1=`$QMAKE_ROOT/$QMAKE_CMD --version | grep --color=never -m 1 -o '[0-9]*\.[0-9]*\.[0-9]*'` QT_VER_1=${QT_VER_1:0:5} fi # Identifying Fallback Qt version if [ -e "$FALLBACK_QMAKE_ROOT/$QMAKE_CMD" ]; then - QT_VER_2=`$FALLBACK_QMAKE_ROOT/$QMAKE_CMD --version | grep --color=never -m 1 -o '[0-9].[0-9].[0-9]'` + QT_VER_2=`$FALLBACK_QMAKE_ROOT/$QMAKE_CMD --version | grep --color=never -m 1 -o '[0-9]*\.[0-9]*\.[0-9]*'` QT_VER_2=${QT_VER_2:0:5} export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$FALLBACK_QT_ROOT/lib" fi