diff options
author | Janek Bevendorff <janek@jbev.net> | 2017-10-17 15:54:11 +0300 |
---|---|---|
committer | Janek Bevendorff <janek@jbev.net> | 2017-10-19 22:24:31 +0300 |
commit | d3208bddb0a01e0ab145e2c8d51f0429023877bd (patch) | |
tree | caece761870214403dfcb846ea0a86afea31f649 /release-tool | |
parent | eb977b8021a997abdb973483ec68ca46ff195e13 (diff) |
Enhance lupdate-qt5 check
Diffstat (limited to 'release-tool')
-rwxr-xr-x | release-tool | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/release-tool b/release-tool index c3fa84d3d..a1d23b405 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 |