From 3cb14ad3bcc57921143cfb4dcd2ebac530e48dad Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sat, 3 Sep 2022 06:31:59 -0700
Subject: [PATCH] Tiny Linux build scripts fixes

---
 .travis.yml           |  1 +
 deploy/build_linux.sh | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c5022b121..0430d5295 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -162,6 +162,7 @@ jobs:
         apt:
           packages:
           - p7zip
+          - p7zip-full
           - python3
           - python3-pip
           - libgl-dev
diff --git a/deploy/build_linux.sh b/deploy/build_linux.sh
index 945066255..754b5e6dc 100755
--- a/deploy/build_linux.sh
+++ b/deploy/build_linux.sh
@@ -35,8 +35,12 @@ QMAKE_STASH_FILE=$PROJECT_DIR/.qmake_stash
 
 # Seacrh Qt
 if [ -z "${QT_VERSION+x}" ]; then
-QT_VERSION=5.15.2;
-QT_BIN_DIR=/opt/Qt/$QT_VERSION/gcc_64/bin
+  QT_VERSION=5.15.2
+  if [ -f /opt/Qt/$QT_VERSION/gcc_64/bin/qmake ]; then
+    QT_BIN_DIR=/opt/Qt/$QT_VERSION/gcc_64/bin
+  elif [ -f $HOME/Qt/$QT_VERSION/gcc_64/bin/qmake ]; then
+    QT_BIN_DIR=$HOME/Qt/$QT_VERSION/gcc_64/bin
+  fi
 fi
 
 echo "Using Qt in $QT_BIN_DIR"
@@ -60,15 +64,14 @@ make
 
 cp -r $DEPLOY_DATA_DIR/* $APP_DIR
 
-wget -O $TOOLS_DIR/CQtDeployer.zip https://github.com/QuasarApp/CQtDeployer/releases/download/v1.5.4.17/CQtDeployer_1.5.4.17_Linux_x86_64.zip
+if [ ! -f $CQTDEPLOYER_DIR/cqtdeployer.sh ]; then
+  wget -O $TOOLS_DIR/CQtDeployer.zip https://github.com/QuasarApp/CQtDeployer/releases/download/v1.5.4.17/CQtDeployer_1.5.4.17_Linux_x86_64.zip
+  unzip -o $TOOLS_DIR/CQtDeployer.zip -d $CQTDEPLOYER_DIR/
+  chmod +x -R $CQTDEPLOYER_DIR
+fi
 
-unzip -o $TOOLS_DIR/CQtDeployer.zip -d $CQTDEPLOYER_DIR/
-
-chmod +x -R $CQTDEPLOYER_DIR
-#chmod +x $CQTDEPLOYER_DIR/binarycreator.sh
 
 $CQTDEPLOYER_DIR/cqtdeployer.sh -bin $BUILD_DIR/client/AmneziaVPN -qmake $QT_BIN_DIR/qmake -qmlDir $PROJECT_DIR/client/ui/qml/ -targetDir $APP_DIR/client/
-
 $CQTDEPLOYER_DIR/cqtdeployer.sh -bin $BUILD_DIR/service/server/AmneziaVPN-service -qmake $QT_BIN_DIR/qmake -targetDir $APP_DIR/service/
 
 rm -f $INSTALLER_DATA_DIR/data.7z