From 2a3039947a2f69f160c76cb5d17312a9c9a63602 Mon Sep 17 00:00:00 2001 From: akashtl Date: Sun, 24 May 2020 20:20:38 +0800 Subject: [PATCH] current build fixes --- lib/desktop_updater.js | 16 ++++++++++------ src/template.ejs | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/desktop_updater.js b/lib/desktop_updater.js index fa76970c0..41a958468 100644 --- a/lib/desktop_updater.js +++ b/lib/desktop_updater.js @@ -56,10 +56,14 @@ function ipcRendererOnUpdateEvent(msgJSON) { document.getElementById('update-info').innerHTML = (msgJSON.upgrade ? 'Update Available' : (msgJSON.version !== '' ? '' : '')); // document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? 'A new release is available (' + msgJSON.version + ').' : (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Encountered an error while updating, try again later.')); - document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? 'A new release is available ' + msgJSON.version + ' (' + msgJSON.build + ').' : (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Encountered an error while updating, try again later.')); + document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? + (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +'(Build: ' + msgJSON.build + ')' : + 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): + (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : + 'Unable to update, please try again later.')); //document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion; - document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ ' (' + msgJSON.currentBuild+')'; + document.getElementById('update_current_version').innerHTML = 'current version ' + msgJSON.currentVersion+ ' (Build: ' + msgJSON.currentBuild+')'; document.getElementById('update_version_electron').innerHTML = (msgJSON.electron === undefined ? process.versions.electron : msgJSON.electron); document.getElementById('update_version_chromium').innerHTML = (msgJSON.chromium === undefined ? process.versions.chrome : msgJSON.chromium); @@ -85,7 +89,7 @@ function ipcRendererOnUpdateEvent(msgJSON) { document.getElementById('update-info').innerHTML = (msgJSON.upgrade ? 'Update Available' : (msgJSON.version !== '' ? '' : '')); document.getElementById('update_latest_version').innerHTML = (msgJSON.upgrade ? - (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version : + (msgJSON.upgradeType==="version"? 'A new release is available ' + msgJSON.version +'(Build: ' + msgJSON.build + ')' : 'A new build (' + msgJSON.build + ') is available in release ' + msgJSON.version + '.'): (msgJSON.version !== '' ? 'You are using latest version of Nynja.' : 'Unable to update, please try again later.')); @@ -524,9 +528,9 @@ if (process.env.currentVersion) { // }; console.log('[DTU] current build',process.env.currentBuild); - console.log('[DTU] appversionObj.currentBuild > process.env.currentBuild',(appversionObj.currentBuild > process.env.currentBuild)); + console.log('[DTU] appversionObj.currentBuild > process.env.currentBuild',(appversionObj.currentBuild > parseInt(process.env.currentBuild))); if(process.env.currentBuild){ - if(appversionObj.build > process.env.currentBuild) { + if(appversionObj.build > parseInt(process.env.currentBuild)) { isBuildUpdate = true; } } @@ -565,7 +569,7 @@ if (process.env.currentVersion) { version: appversionObj.version, build: appversionObj.build, currentVersion: process.env.currentVersion, - currentBuild: process.env.currentBuild, + currentBuild: parseInt(process.env.currentBuild), notes: appversionObj.notes, status: 200 }) diff --git a/src/template.ejs b/src/template.ejs index 887fe614b..b1e2d2f76 100644 --- a/src/template.ejs +++ b/src/template.ejs @@ -182,7 +182,7 @@
-

After finishing the download, NYNJA application will be restarted to apply new updates.

+

When download completes, NYNJA application will be restarted to apply new updates.

Do you want to continue?