Finish 2.0.0
This commit is contained in:
commit
41d028951f
@ -10,6 +10,7 @@ branches:
|
|||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
- develop
|
- develop
|
||||||
|
- /release.*/
|
||||||
- /.*travis/
|
- /.*travis/
|
||||||
os:
|
os:
|
||||||
- linux
|
- linux
|
||||||
|
@ -32,8 +32,8 @@ namespace {
|
|||||||
|
|
||||||
QString versionField (const QJsonObject &component, const QString &field) {
|
QString versionField (const QJsonObject &component, const QString &field) {
|
||||||
return component.contains (field + _platform)
|
return component.contains (field + _platform)
|
||||||
? component[field + _platform].toString ()
|
? component[field + _platform].toVariant ().toString ()
|
||||||
: component[field].toString ();
|
: component[field].toVariant ().toString ();
|
||||||
}
|
}
|
||||||
|
|
||||||
QFileInfo fileDir (const QString &fileName) {
|
QFileInfo fileDir (const QString &fileName) {
|
||||||
@ -155,7 +155,7 @@ void Updater::parseAvailableVersion () {
|
|||||||
if (!installDir.isWritable ()) { // check dir because install = remove + make new
|
if (!installDir.isWritable ()) { // check dir because install = remove + make new
|
||||||
inaccessible << installDir.absoluteFilePath ();
|
inaccessible << installDir.absoluteFilePath ();
|
||||||
}
|
}
|
||||||
if (current[_version].toInt () < available[_compatibleVersion].toInt ()) {
|
if (current[_version].toInt () < versionField (available, _compatibleVersion).toInt ()) {
|
||||||
incompatible << component;
|
incompatible << component;
|
||||||
}
|
}
|
||||||
if (!QFile::exists (path) || current[_version].toInt () < available[_version].toInt ()) {
|
if (!QFile::exists (path) || current[_version].toInt () < available[_version].toInt ()) {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
source ./options.sh $@
|
source ./options.sh $@
|
||||||
cleanupDirInNeeded $WORK_DIR
|
#cleanupDirInNeeded $WORK_DIR
|
||||||
|
|
||||||
echo "Running all scripts for $PLATFORM"
|
echo "Running all scripts for $PLATFORM"
|
||||||
#./install_deps $@
|
#./install_deps $@
|
||||||
|
@ -4,12 +4,13 @@
|
|||||||
"Application": {
|
"Application": {
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"compatibleVersion": 1,
|
"compatibleVersion": 1,
|
||||||
|
"compatibleVersion_linux": 999,
|
||||||
"built_in": true,
|
"built_in": true,
|
||||||
"versionString": "2.0.0",
|
"versionString": "2.0.0",
|
||||||
"permissions": "0x7755",
|
"permissions": "0x7755",
|
||||||
"url_win": "https://raw.githubusercontent.com/OneMoreGres/ScreenTranslator/releases/2.0.0/ScreenTranslator.exe",
|
"url_win": "https://raw.githubusercontent.com/OneMoreGres/ScreenTranslator/releases/2.0.0/ScreenTranslator.exe",
|
||||||
"path_win": "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"
|
"path_linux": "ScreenTranslator"
|
||||||
},
|
},
|
||||||
"Bing translator": {
|
"Bing translator": {
|
||||||
|
Loading…
Reference in New Issue
Block a user