diff --git a/.travis.yml b/.travis.yml index 8acd8f5..e981e6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ branches: only: - master - develop + - /release.*/ - /.*travis/ os: - linux diff --git a/Updater.cpp b/Updater.cpp index 102fdd1..c4fa829 100644 --- a/Updater.cpp +++ b/Updater.cpp @@ -32,8 +32,8 @@ namespace { QString versionField (const QJsonObject &component, const QString &field) { return component.contains (field + _platform) - ? component[field + _platform].toString () - : component[field].toString (); + ? component[field + _platform].toVariant ().toString () + : component[field].toVariant ().toString (); } QFileInfo fileDir (const QString &fileName) { @@ -155,7 +155,7 @@ void Updater::parseAvailableVersion () { if (!installDir.isWritable ()) { // check dir because install = remove + make new inaccessible << installDir.absoluteFilePath (); } - if (current[_version].toInt () < available[_compatibleVersion].toInt ()) { + if (current[_version].toInt () < versionField (available, _compatibleVersion).toInt ()) { incompatible << component; } if (!QFile::exists (path) || current[_version].toInt () < available[_version].toInt ()) { diff --git a/scripts/make_all.sh b/scripts/make_all.sh index 2412a56..f325033 100755 --- a/scripts/make_all.sh +++ b/scripts/make_all.sh @@ -1,7 +1,7 @@ #!/bin/bash source ./options.sh $@ -cleanupDirInNeeded $WORK_DIR +#cleanupDirInNeeded $WORK_DIR echo "Running all scripts for $PLATFORM" #./install_deps $@ diff --git a/version.json b/version.json index 8d78aa1..d57f8cf 100644 --- a/version.json +++ b/version.json @@ -4,12 +4,13 @@ "Application": { "version": 1, "compatibleVersion": 1, + "compatibleVersion_linux": 999, "built_in": true, "versionString": "2.0.0", "permissions": "0x7755", "url_win": "https://raw.githubusercontent.com/OneMoreGres/ScreenTranslator/releases/2.0.0/ScreenTranslator.exe", "path_win": "ScreenTranslator.exe", - "url_linux": "https://raw.githubusercontent.com/OneMoreGres/ScreenTranslator/releases/2.0.0/ScreenTranslator", + "url_linux": "disabled", "path_linux": "ScreenTranslator" }, "Bing translator": {