profoundjs 6.0.0 → 6.0.2

package/setup/complete_install.js

@@ -1,5 +1,6 @@
 
 const child_process = require("child_process");
+const path = require("path");
 
 let args = process.argv.slice(2);
 if (args.length > 0) {
@@ -11,9 +12,10 @@ else {
 
 try {
   child_process.execSync(
-    `npm run --prefix=node_modules/profoundjs completeInstall ${args}`,
+    `npm run completeInstall ${args}`,
     {
-      stdio: "inherit"
+      stdio: "inherit",
+      cwd: path.join(__dirname, "node_modules", "profoundjs")
     }
   );
 }

package/setup/package.json

@@ -12,7 +12,7 @@
     "profoundui"
   ],
   "dependencies": {
-    "profoundjs": "^6.0.0"
+    "profoundjs": "^6.0.2"
   },
   "scripts": {
     "start": "node start.js"

package/setup/setup.js

@@ -36,6 +36,8 @@ const logDir = path.join(os.tmpdir(), "profoundjs-" + uuidv4());
 const logPath = path.join(logDir, "setup.log");
 let logFile;
 
+let SILENT_MODE = false;
+
 (async () => {
   try {
 
@@ -103,12 +105,15 @@ let logFile;
     }
 
     if (args.silent === true) {
+      SILENT_MODE = true;
       RED = CYAN = RESET = "";
     }
 
-    // Initialize log file.
-    fs.mkdirSync(logDir);
-    logFile = fs.openSync(logPath, "w");
+    if (!SILENT_MODE) {
+      // Initialize log file.
+      fs.mkdirSync(logDir);
+      logFile = fs.openSync(logPath, "w");
+    }
 
     // Validate arguments.
     if (args._.length > 0) {
@@ -184,7 +189,11 @@ let logFile;
         `npm install idb-connector@"${idb_connector_version}"`,
         {
           cwd: iutils.getDeployDir(),
-          stdio: ["ignore", logFile, logFile]
+          stdio: [
+            "ignore",
+            SILENT_MODE ? process.stdout : logFile,
+            SILENT_MODE ? process.stderr : logFile
+          ]
         }
       );
     }
@@ -194,7 +203,11 @@ let logFile;
         `npm install --save-optional profoundjs-node-pty@"${node_pty_version}"`,
         {
           cwd: iutils.getDeployDir(),
-          stdio: ["ignore", logFile, logFile]
+          stdio: [
+            "ignore",
+            SILENT_MODE ? process.stdout : logFile,
+            SILENT_MODE ? process.stderr : logFile
+          ]
         }
       );
     }
@@ -219,7 +232,11 @@ let logFile;
           `npm install nodegit@"${version}"`,
           {
             cwd: iutils.getDeployDir(),
-            stdio: ["ignore", logFile, logFile]
+            stdio: [
+              "ignore",
+              SILENT_MODE ? process.stdout : logFile,
+              SILENT_MODE ? process.stderr : logFile
+            ]
           }
         );
       }
@@ -376,11 +393,6 @@ let logFile;
       }
     }
     log(`\n${CYAN}Profound.js installation complete.${RESET}\n`);
-    if (args.silent === true) {
-      // GUI installer hunts for this message in the output to determine log file location.
-      // Don't change formatting of this message without corresponding update to GUI.
-      console.log(`See installation log: ${logPath}\n`);
-    }
 
   }
   catch (error) {
@@ -400,6 +412,9 @@ function logError(...args) {
 }
 
 function logToFile(...args) {
+  if (SILENT_MODE) {
+    return;
+  }
   let output = `${util.format(...args)}\n`;      // Mimic console.log().
   output = output.replace(/\x1b\[[0-9]+m/g, ""); // Strip terminal escape codes for colors.
   fs.writeFileSync(logFile, output, { flag: "a" });
@@ -407,9 +422,9 @@ function logToFile(...args) {
 
 function die() {
   logError(`\n${RED}Profound.js installation failed.${RESET}`);
-  // GUI installer hunts for this message in the output to determine log file location.
-  // Don't change formatting of this message without corresponding update to GUI.
-  console.error(`${RED}See installation log:${RESET} ${logPath}\n`);
+  if (!SILENT_MODE) {
+    console.error(`${RED}See installation log:${RESET} ${logPath}\n`);
+  }
   process.exit(1);
 }
 
@@ -599,7 +614,11 @@ function runCommand(command, switches) {
   }
 
   const options = {
-    stdio: ["ignore", logFile, logFile],
+    stdio: [
+      "ignore",
+      SILENT_MODE ? process.stdout : logFile,
+      SILENT_MODE ? process.stderr : logFile
+    ],
     cwd: __dirname,
     env: {
       QIBM_USE_DESCRIPTOR_STDIO: "Y",