From 111cc8dcbb84a2dd3d02802c8471ee7024345c74 Mon Sep 17 00:00:00 2001 From: ronoaer Date: Thu, 2 Nov 2023 02:09:30 -0700 Subject: [PATCH] implemented the function check for updates and online installer for the platform linux --- client/ui/controllers/pageController.cpp | 11 ++++++++++- deploy/build_linux.sh | 9 +++++++++ deploy/installer/config/linux.xml.in | 8 ++++---- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp index 3d853b78..64a7de08 100644 --- a/client/ui/controllers/pageController.cpp +++ b/client/ui/controllers/pageController.cpp @@ -167,7 +167,7 @@ void PageController::closeApplication() bool PageController::checkForUpdates() { -#ifdef Q_OS_IOS +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) return false; #else QString path = qApp->applicationDirPath(); @@ -183,6 +183,15 @@ bool PageController::checkForUpdates() checked = true; #endif +#ifdef Q_OS_LINUX + if(path.contains("/client/bin")) { + path = path.remove("/client/bin"); + } + path = path + "/maintenancetool"; + + checked = true; +#endif + if (!checked) { return false; } diff --git a/deploy/build_linux.sh b/deploy/build_linux.sh index 1b9c698a..d74de044 100755 --- a/deploy/build_linux.sh +++ b/deploy/build_linux.sh @@ -42,6 +42,9 @@ if [ -z "${QT_VERSION+x}" ]; then elif [ -f $HOME/Qt/$QT_VERSION/gcc_64/bin/qmake ]; then QT_BIN_DIR=$HOME/Qt/$QT_VERSION/gcc_64/bin fi + + QIF_VERSION=4.6 + QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin fi echo "Using Qt in $QT_BIN_DIR" @@ -85,4 +88,10 @@ cp -r $PROJECT_DIR/deploy/installer $BUILD_DIR $CQTDEPLOYER_DIR/binarycreator.sh --offline-only -v -c $BUILD_DIR/installer/config/linux.xml -p $BUILD_DIR/installer/packages -f $PROJECT_DIR/deploy/AmneziaVPN_Linux_Installer +# echo "Generating repository..." +$QIF_BIN_DIR/repogen -p $BUILD_DIR/installer/packages $BUILD_DIR/installer/amneziavpn-linux-repository + +# echo "Building online installer..." +$CQTDEPLOYER_DIR/binarycreator.sh --online-only -c $BUILD_DIR/installer/config/linux.xml -p $BUILD_DIR/installer/packages $PROJECT_DIR/deploy/AmneziaVPN_Linux_Online_Installer + diff --git a/deploy/installer/config/linux.xml.in b/deploy/installer/config/linux.xml.in index a39edbe4..da58a788 100644 --- a/deploy/installer/config/linux.xml.in +++ b/deploy/installer/config/linux.xml.in @@ -13,14 +13,14 @@ true false controlscript.js - false + true true - false + true true - https://amneziavpn.org/updates/linux - true + https://updates.amzsvc.com/beta/linux + 1 AmneziaVPN - repository for Linux