GHI CI: stop on install_qt fail

Author: iakov

buildScripts/github/install.sh

@@ -36,7 +36,7 @@ case "$(uname)" in
     sudo port selfupdate
     sudo port install libusb +universal
 
-    install_qt mac desktop "${TRIK_QT_VERSION}" "$HOME/Qt" $qt_modules $qt_archives
+    install_qt mac desktop "${TRIK_QT_VERSION}" "$HOME/Qt" qt_modules qt_archives
     sudo xcode-select -s /Applications/Xcode_${XCODE_VERSION}.app/Contents/Developer
     xcodebuild -showsdks
     xcrun -sdk macosx --show-sdk-path
@@ -72,7 +72,7 @@ case "$(uname)" in
         #libQt5WaylandCompositor.so.5.15: libQt5Quick.so.5 libQt5Qml.so.5 libQt5QmlModels.so.5 
         qt_modules+=("qtwaylandcompositor")
         qt_archives+=("icu" "qtwayland")
-        install_qt linux desktop "$TRIK_QT_VERSION" "$HOME/Qt" $qt_modules $qt_archives
+        install_qt linux desktop "$TRIK_QT_VERSION" "$HOME/Qt" qt_modules qt_archives
         QT_ROOT_DIR=$(ls -1d "$HOME"/Qt/$TRIK_QT_VERSION*/gcc_64 | head -n 1)
         echo "$QT_ROOT_DIR/bin" >> $GITHUB_PATH
       fi

buildScripts/github/install_linter.sh

@@ -8,7 +8,7 @@ sudo apt-get update && sudo apt-get install -y --no-install-recommends vera++
 
 modules=("qtscript" "qtwaylandcompositor")
 archives=("qtbase" "qtmultimedia" "qtsvg" "qtscript" "qttools" "qtserialport" "qtimageformats" "icu" "qtwayland" "qtdeclarative" "qttranslations" "qtsvgwidgets" "qtxmlpatterns" "qtwebenginewidgets" "qtwebkit" "qtwebkitwidgets")
-install_qt linux desktop "$TRIK_QT_VERSION" "$HOME/Qt" $modules $archives
+install_qt linux desktop "$TRIK_QT_VERSION" "$HOME/Qt" modules archives
 QT_ROOT_DIR=$(ls -1d "$HOME"/Qt/$TRIK_QT_VERSION*/gcc_64 | head -n 1)
 echo "$QT_ROOT_DIR/bin" >> $GITHUB_PATH
 export PATH="$QT_ROOT_DIR/bin:$PATH"

buildScripts/github/utilities.sh

@@ -24,7 +24,7 @@ get_array_by_name() {
 }
 
 
-install_qt(){
+install_qt() {
   # Usage: install_qt <os> <platform-type> <qt-version> <path-to-install-qt> <modules> <archives>
   # TODO: add <addittional-options>
   "$TRIK_PYTHON" -m venv venv
@@ -35,8 +35,8 @@ install_qt(){
 
 
   local -a get_array_by_name_result=() #declare before call
-  [[ -n "$5:-" ]] && get_array_by_name "${5}" && (( ${#get_array_by_name_result[@]} > 0 )) && cmd+=("-m" "${get_array_by_name_result[@]}")
-  [[ -n "$6:-" ]] && get_array_by_name "${6}" && (( ${#get_array_by_name_result[@]} > 0 )) && cmd+=("--archives" "${get_array_by_name_result[@]}")
+  if [[ -n "$5:-" ]] ; then { get_array_by_name "${5}" || return 1 ; (( ${#get_array_by_name_result[@]} > 0 )) && cmd+=("-m" "${get_array_by_name_result[@]}") ; } ; fi
+  if [[ -n "$6:-" ]] ; then { get_array_by_name "${6}" || return 1 ; (( ${#get_array_by_name_result[@]} > 0 )) && cmd+=("--archives" "${get_array_by_name_result[@]}") ; } ; fi
 
   "${cmd[@]}"