From 3b79e5fcd0eb43d3626e0c6eecb9d7577a164cf9 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 20 Jan 2024 10:29:33 -0500 Subject: [PATCH 1/2] Fix the URL for checking releases The URL was definitely wrong and the new URL should be correct but still doesn't seem to work. According to https://git.hush.is/api/swagger#/repository/repoListReleases it should be the correct URL. --- src/controller.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controller.cpp b/src/controller.cpp index 6908fb4..c597158 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1566,10 +1566,10 @@ void Controller::checkForUpdate(bool silent) if (!zrpc->haveConnection()) return noConnection(); - QUrl cmcURL("https://git.hush.is/repos/MyHush/SilentDragonLite/releases"); + QUrl giteaURL("https://git.hush.is/repos/hush/SilentDragonLite/releases"); QNetworkRequest req; - req.setUrl(cmcURL); + req.setUrl(giteaURL); QNetworkAccessManager *manager = new QNetworkAccessManager(this->main); QNetworkReply *reply = manager->get(req); From 68d9388c1b87139d00fcc10ce94dd7a2109fdced Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 20 Jan 2024 13:01:18 -0500 Subject: [PATCH 2/2] Check for valid QT versions or bail early --- build.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index c648fed..8abfeb7 100755 --- a/build.sh +++ b/build.sh @@ -30,7 +30,21 @@ then fi VERSION=$(grep APP_VERSION src/version.h |cut -d\" -f2) -echo "Compiling SilentDragonLite $VERSION on $UNAME with args=$@" +QTVERSION=$(qmake --version | tail -n 1 | cut -d' ' -f4) +QT_MAJOR_VERSION=$(echo $QTVERSION | cut -d. -f1) +QT_SUB_VERSION=$(echo $QTVERSION | cut -d. -f2) + +if [ "$QT_MAJOR_VERSION" != "5" ]; then + echo "Your QT version $QTVERSION is not compatible, only QT 5.x is supported" + exit 1 +fi + +if [ "$QT_SUB_VERSION" -lt "12" ]; then + echo "Your QT version $QTVERSION is not compatible, at least QT 5.12.0 is required" + exit 1 +fi + +echo "Compiling SilentDragonLite $VERSION on $UNAME with QT $QTVERSION and args=$@" CONF=silentdragon-lite.pro set -e