From 9aa836ce40498428327a33870c4cac053e99bef1 Mon Sep 17 00:00:00 2001 From: Iakov Kirilenko Date: Sun, 7 Jul 2019 11:27:13 +0300 Subject: [PATCH] Travis: try to guess qmake path --- buildScripts/travis/after_script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildScripts/travis/after_script.sh b/buildScripts/travis/after_script.sh index 683f9f5a50..37e90f9b38 100755 --- a/buildScripts/travis/after_script.sh +++ b/buildScripts/travis/after_script.sh @@ -7,12 +7,12 @@ case $TRAVIS_OS_NAME in TSNAME=trik-studio-installer-mac-$TRAVIS_BRANCH.dmg ;; linux) - QTIFWBIN=$(find /Qt/Tools/QtInstallerFramework/ -maxdepth 2 -name bin -type d -print0 | sort -Vrz | head -zn 1) + QTIFWBIN=$($EXECUTOR bash -c 'find /Qt/Tools/QtInstallerFramework/ -maxdepth 2 -name bin -type d -print0 | sort -Vrz | head -zn 1') TSNAME=trik-studio-installer-linux-$TRAVIS_BRANCH.run ;; *) exit 1 ;; esac -QTBIN=${QTBIN:-$($EXECUTOR qmake -query QT_HOST_BINS)} +QTBIN=${QTBIN:-$($EXECUTOR bash -c "make qmake -n | sed 's#/qmake.*\$##g'")} df -h . if $INSTALLER && ! $TIMEOUT && [ "$TRAVIS_REPO_SLUG" == "trikset/trik-studio" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]