Merge pull request #451 from NordicSemiconductor/fix_update_all_apps

Fix “Update all apps”

Changelog.md

@@ -1,3 +1,8 @@
+## Version 3.4.2
+### Fixes
+- “Update all apps” sometimes showed an error message (even though it worked
+  correctly). #451
+
 ## Version 3.4.1
 ### Updates
 - Updated to pc-nrfjprog-js v1.7.3, including bundled nrfjprog v10.9.0 and JLink 6.80a

package.json

@@ -1,6 +1,6 @@
 {
     "name": "nrfconnect",
-    "version": "3.4.1",
+    "version": "3.4.2",
     "description": "nRF Connect for PC",
     "repository": {
         "type": "git",

src/main/apps.js

@@ -239,7 +239,7 @@ function installLocalAppArchive(tgzFilePath) {
         .then(isInstalled => {
             if (!isInstalled) {
                 return fileUtil.mkdir(appPath)
-                    .then(() => fileUtil.extractNpmPackage(tgzFilePath, appPath))
+                    .then(() => fileUtil.extractNpmPackage(appName, tgzFilePath, appPath))
                     .then(() => fileUtil.deleteFile(tgzFilePath));
             }
             return Promise.resolve();
@@ -490,7 +490,11 @@ function removeOfficialApp(name, source) {
             + `to remove app directory ${appPath}. The directory does not `
             + 'have node_modules in its path.'));
     }
-    return fs.remove(appPath);
+
+    const tmpDir = fileUtil.getTmpFilename(name);
+
+    return fs.move(appPath, tmpDir)
+        .then(() => fs.remove(tmpDir));
 }
 
 /**
@@ -513,7 +517,7 @@ function installOfficialApp(name, version, source) {
                     }
                     return Promise.resolve();
                 })
-                .then(() => fileUtil.extractNpmPackage(tgzFilePath, appPath))
+                .then(() => fileUtil.extractNpmPackage(name, tgzFilePath, appPath))
                 .then(() => fileUtil.deleteFile(tgzFilePath));
         });
 }

src/main/fileUtil.js

@@ -44,7 +44,9 @@ const fse = require('fs-extra');
 const path = require('path');
 const targz = require('targz');
 const chmodr = require('chmodr');
+const { v4 } = require('uuid');
 const { mkdir, mkdirIfNotExists } = require('./mkdir');
+const config = require('./config');
 
 /**
  * Open the given file path and return its string contents.
@@ -228,15 +230,33 @@ function chmodDir(src, mode) {
     });
 }
 
+/**
+ * Create a unique name for a temporary file or folder. The file is not
+ * created, this just generates an absolute name for it in the directory
+ * for temporary files.
+ *
+ * @param {string} basename a basename to include in the name to make it easier
+ * to recognise
+ * @returns {string} the unique file name
+ */
+function getTmpFilename(basename) {
+    return path.join(config.getTmpDir(), `${basename}-${v4()}`);
+}
+
 /**
  * Extract the given npm package (tgz file) to the given destination directory.
  *
+ * @param {string} appName  the name of the app to extract
  * @param {string} tgzFile the tgz file path to extract.
  * @param {string} destinationDir the destination directory.
  * @returns {Promise} promise that resolves if successful.
  */
-function extractNpmPackage(tgzFile, destinationDir) {
-    return untar(tgzFile, destinationDir, 1);
+function extractNpmPackage(appName, tgzFile, destinationDir) {
+    const tmpDir = getTmpFilename(appName);
+    const moveToDestinationDir = () => fse.move(tmpDir, destinationDir, { overwrite: true });
+
+    return untar(tgzFile, tmpDir, 1)
+        .then(moveToDestinationDir);
 }
 
 /**
@@ -288,7 +308,6 @@ function createJsonFileIfNotExists(filePath, jsonData) {
 }
 
 module.exports = {
-    readFile,
     readJsonFile,
     listDirectories,
     listFiles,
@@ -297,6 +316,7 @@ module.exports = {
     copy,
     untar,
     chmodDir,
+    getTmpFilename,
     extractNpmPackage,
     getNameFromNpmPackage,
     mkdir,