From d3208bddb0a01e0ab145e2c8d51f0429023877bd Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Tue, 17 Oct 2017 14:54:11 +0200 Subject: [PATCH] Enhance lupdate-qt5 check --- release-tool | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/release-tool b/release-tool index c3fa84d3..a1d23b40 100755 --- a/release-tool +++ b/release-tool @@ -289,10 +289,15 @@ checkTransifexCommandExists() { if [ 0 -ne $? ]; then exitError "Transifex tool 'tx' not installed! Please install it using 'pip install transifex-client'" fi +} - command -v lupdate-qt5 > /dev/null - if [ 0 -ne $? ]; then - exitError "Qt Linguist tool (lupdate-qt5) is not installed! Please install using 'apt install qttools5-dev-tools'" +checkQt5LUpdateExists() { + command -v lupdate > /dev/null + if [ 0 -eq $? ] && ! $(lupdate -version | grep -q "lupdate version 5\."); then + command -v lupdate-qt5 > /dev/null + if [ 0 -ne $? ]; then + exitError "Qt Linguist tool (lupdate-qt5) is not installed! Please install using 'apt install qttools5-dev-tools'" + fi fi } @@ -307,6 +312,7 @@ performChecks() { logInfo "Validating toolset and repository..." checkTransifexCommandExists + checkQt5LUpdateExists checkGitRepository checkReleaseDoesNotExist checkWorkingTreeClean