Feat/use latest nrfutil URLs (#1017)

* Feat: bundle latest nrfutil wrapper
NordicSemiconductor · Jun 21, 2024 · 9bc66cb · 9bc66cb
1 parent 7733e7a
commit 9bc66cb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/scripts/getNrfutil.js b/scripts/getNrfutil.js
@@ -10,17 +10,17 @@ const downloadFile = require('./downloadFile');
 
 const allConfigs = {
     win32: {
-        url: 'https://developer.nordicsemi.com/.pc-tools/nrfutil/x64-windows/nrfutil.exe',
+        url: 'https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/executables/x86_64-pc-windows-msvc/nrfutil.exe',
         localFile: 'nrfutil.exe',
         makeFileExecutable: false,
     },
     darwin: {
-        url: 'https://developer.nordicsemi.com/.pc-tools/nrfutil/universal-osx/nrfutil',
+        url: 'https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/executables/universal-apple-darwin/nrfutil',
         localFile: 'nrfutil',
         makeFileExecutable: true,
     },
     linux: {
-        url: 'https://developer.nordicsemi.com/.pc-tools/nrfutil/x64-linux/nrfutil',
+        url: 'https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/executables/x86_64-unknown-linux-gnu/nrfutil',
         localFile: 'nrfutil',
         makeFileExecutable: true,
     },

diff --git a/src/main/configureElectronApp.ts b/src/main/configureElectronApp.ts
@@ -89,8 +89,21 @@ const initNrfutil = () => {
 
     const nrfutilBundled = path.join(getBundledResourcesDir(), binName);
     const nrfutilInAppPath = path.join(getUserDataDir(), binName);
-    if (!fse.existsSync(nrfutilInAppPath)) {
+    const nrfutilBundledStats = fse.statSync(nrfutilBundled);
+
+    const noNrfutilInstalled = !fse.existsSync(nrfutilInAppPath);
+    const installedNrfutilOlderThenBundledNrfutil =
+        Math.round(nrfutilBundledStats.mtimeMs) >
+        Math.round(fse.statSync(nrfutilInAppPath).mtimeMs);
+
+    if (noNrfutilInstalled || installedNrfutilOlderThenBundledNrfutil) {
         fse.copyFileSync(nrfutilBundled, nrfutilInAppPath);
+        fse.utimes(
+            nrfutilInAppPath,
+            nrfutilBundledStats.atime,
+            nrfutilBundledStats.mtime
+        );
+        logger.info('update nrfutil exe');
     }
 
     const nrfutilBundledSandboxes = path.join(