Fix rev (betaflight#3652)

* Fix rev * Remove COMMITHASH * Use manifest for Android too * Fix copy pasta
HThuren · Dec 1, 2023 · ec0ceb6 · ec0ceb6
1 parent 66bc189
commit ec0ceb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/js/main.js b/src/js/main.js
@@ -50,7 +50,7 @@ function useGlobalNodeFunctions() {
 }
 
 function readConfiguratorVersionMetadata() {
-    if (GUI.isNWJS()) {
+    if (GUI.isNWJS() || GUI.isCordova()) {
         const manifest = chrome.runtime.getManifest();
         CONFIGURATOR.productName = manifest.productName;
         CONFIGURATOR.version = manifest.version;

diff --git a/vite.config.js b/vite.config.js
@@ -5,8 +5,9 @@ import path from "node:path";
 import { readFileSync } from "node:fs";
 import copy from "rollup-plugin-copy";
 import pkg from './package.json';
+import * as child from 'child_process';
 
-const childProcess = require('child_process');
+const commitHash = child.execSync('git rev-parse --short HEAD').toString();
 
 function serveFileFromDirectory(directory) {
     return (req, res, next) => {
@@ -52,7 +53,7 @@ export default defineConfig({
     define: {
         '__APP_VERSION__': JSON.stringify(pkg.version),
         '__APP_PRODUCTNAME__': JSON.stringify(pkg.productName),
-        '__APP_REVISION__': JSON.stringify(childProcess.execSync("git rev-parse --short HEAD").toString().trim()),
+        '__APP_REVISION__': JSON.stringify(commitHash),
     },
     test: {
         // NOTE: this is a replacement location for karma tests.