Get version number from package.json on app start

This is easy to miss when prepping a new release so I figured we might as well automate it
This commit is contained in:
CakeLancelot 2023-02-09 05:32:21 -06:00
parent 5da0da1981
commit d554b6b968
6 changed files with 25 additions and 6 deletions

View File

@ -54,7 +54,7 @@ body {
"Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
} }
#of-versionnumber { #of-versionnumberdiv {
position: fixed; position: fixed;
bottom: 4px; bottom: 4px;
right: 8px; right: 8px;

View File

@ -25,6 +25,23 @@ function disableServerListButtons() {
$("#of-deleteserver-button").prop("disabled", true); $("#of-deleteserver-button").prop("disabled", true);
} }
function getAppVersion() {
appversion = remote.require("app").getVersion();
// simplify version, ex. 1.4.0 -> 1.4,
// but only if a revision number isn't present
if(appversion.endsWith(".0")){
return appversion.substr(0, appversion.length - 2)
} else {
return appversion
}
}
function setAppVersionText() {
$("#of-aboutversionnumber").text("Version " + getAppVersion());
$("#of-versionnumber").text("v" + getAppVersion());
}
function addServer() { function addServer() {
var jsontomodify = JSON.parse( var jsontomodify = JSON.parse(
remotefs.readFileSync(userdir + "\\servers.json") remotefs.readFileSync(userdir + "\\servers.json")

View File

@ -1,5 +1,5 @@
const fs = require('fs'); const fs = require('fs');
const dir = './dist/win-ia32-unpacked/resources/default_app' const defaultdir = './dist/win-ia32-unpacked/resources/default_app'
const exefile = './dist/win-ia32-unpacked/OpenFusionClient.exe' const exefile = './dist/win-ia32-unpacked/OpenFusionClient.exe'
exports.default = function() { exports.default = function() {

View File

@ -151,7 +151,7 @@
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p class="text-monospace">Version 1.4</p> <p id="of-aboutversionnumber" class="text-monospace">APP_VERSION_NUMBER</p>
<p> <p>
©2020-2023 OpenFusion Contributors<br />OpenFusion ©2020-2023 OpenFusion Contributors<br />OpenFusion
is licensed under MIT.<br /> is licensed under MIT.<br />
@ -447,13 +447,14 @@
</div> </div>
</div> </div>
</div> </div>
<div id="of-versionnumber"> <div id="of-versionnumberdiv">
<a <a
id="of-versionnumber"
class="text-monospace text-secondary" class="text-monospace text-secondary"
href="#of-aboutmodal" href="#of-aboutmodal"
data-toggle="modal" data-toggle="modal"
data-target="#of-aboutmodal" data-target="#of-aboutmodal"
>v1.4</a >v0</a
> >
</div> </div>
</section> </section>

View File

@ -174,6 +174,7 @@ function showMainWindow() {
// Reduces white flash when opening the program // Reduces white flash when opening the program
mainWindow.webContents.on("did-finish-load", function () { mainWindow.webContents.on("did-finish-load", function () {
mainWindow.webContents.executeJavaScript("setAppVersionText();");
mainWindow.show(); mainWindow.show();
// everything's loaded, tell the renderer process to do its thing // everything's loaded, tell the renderer process to do its thing
mainWindow.webContents.executeJavaScript("loadConfig();"); mainWindow.webContents.executeJavaScript("loadConfig();");

View File

@ -1,6 +1,6 @@
{ {
"name": "OpenFusionClient", "name": "OpenFusionClient",
"version": "1.4.0", "version": "1.4.1",
"description": "OpenFusionClient", "description": "OpenFusionClient",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {