profoundjs 6.0.0-beta.2 → 6.0.0-beta.6

package/setup/setup.js

@@ -1,257 +1,481 @@
 
-const htdocs_download_url = 'http://resources.profoundjs.com/profoundui_htdocs.zip';
-const pjsBaseInstance = '/profoundjs-base/instances/';
-
-const child_process = require('child_process');
-const fs = require('fs');
-const fse = require('fs-extra');
-const path = require('path');
-const extract = require('extract-zip');
-const crypto = require('crypto');
-const os = require('os');
-
-var IBMi = (os.type() === 'OS400');
-var setupDir = __dirname;
-var dirSep = path.sep;
-var dirParts = __dirname.split(dirSep);
-while (dirParts.length > 0 && dirParts.pop() !== "node_modules") {};
-if (dirParts.length === 0) {
-  console.log("Can't find deployment directory.");
-  process.exit(1);
-}
-var deployDir = dirParts.join(dirSep);
-var silent = process.argv.includes("--silent");
-if (process.env.SILENT_INSTALL) silent = true;
+"use strict";
 
-var portNumber = "8081";  // default port
-if (process.env.PORT) portNumber = process.env.PORT;
+/*
 
-function downloadHtdocs(htdocsDir, callback) {
-  var zipFile = setupDir + dirSep + 'htdocs.zip';
-  console.log("");
-  console.log("Starting Download...")
-  console.log("");
+  This is NPM script: npm run setup
 
-  const profound = require('profoundjs');
+  * Performs additional installation.
+  * Kicked off automatically after NPM install if 'config.js' is present in deployment directory.
+  * Otherwise kicked off from 'complete_install.js' which is manually run by user.
+  * Can also be run directly for advanced/automated installation.
 
-  profound.utils.downloadProgress(htdocs_download_url, zipFile, (err) => {
+  NOTE: Output from this script will be suppressed by NPM 7+ when invoked via 'npm install', unless process ends with non-zero exit code.
 
-    if (err) {
-      console.error("Download ended in error:");
-      console.error(err);
-      if (typeof callback === "function") callback();
-    }
-    else {
-      console.log("");
-      console.log("Download completed. Extracting...")
-      extract(zipFile, { dir: htdocsDir })
-      .then(
-        function() {
-          try {
-            fs.unlinkSync(zipFile);  // delete zip file after it's unzipped
-          }
-          catch (error) {}
-          console.log("Directory " + htdocsDir + " restored.");
+*/
+
+const htdocs_download_url = "http://resources.profoundjs.com/profoundui_htdocs.zip";
+
+const child_process = require("child_process");
+const compareVersions = require("compare-versions");
+const crypto = require("crypto");
+const extract = require("extract-zip");
+const fs = require("fs-extra");
+const iutils = require("./install_utils.js");
+const os = require("os");
+const minimist = require("minimist");
+const path = require("path");
+const util = require("util");
+const uuidv4 = require("uuid").v4;
+
+const IBMi = os.type() === "OS400";
+
+const RED   = "\x1b[31m";
+const CYAN  = "\x1b[36m";
+const RESET = "\x1b[0m";
+
+const logDir = path.join(os.tmpdir(), "profoundjs-" + uuidv4());
+const logPath = path.join(logDir, "setup.log");
+let logFile;
+
+(async () => {
+  try {
+
+    // Parse arguments.
+    const args = minimist(
+      process.argv.slice(2),
+      {
+        alias: {
+          "c": "config-file",
+          "h": "help"
         },
-        function (err) {
-          console.error("Extraction ended in error:");
-          console.error(err);
-        }
-      )
-      .finally(function() {
-        if (typeof callback === "function") process.nextTick(callback);
-      });
+        boolean: [
+          "h",
+          "ibmi-connector-library",
+          "ibmi-instance-autostart",
+          "nodegit",
+          "static-files"
+        ],
+        string: [
+          "c",
+          "ibmi-instance",
+          "ibmi-instance-ccsid",
+          "ibmi-instance-node-path",
+          "nodegit-version"
+        ]
+      }
+    );
+
+    // Show help and quit, if requested.
+    if (args["help"]) {
+  const HELP = `Usage: npm run setup -- [OPTION]
+  -c, --config-file=<file>           Alternate config file.
+  -h, --help                         Print this help and exit.
+  --nodegit                          Install nodegit.
+  --nodegit-version=version          Override nodegit version.
+  --static-files                     Install static files.
+  --ibmi-connector-library           Install IBM i Connector library.
+  --ibmi-instance=<name>             Create/update STRTCPSVR instance config.
+  --ibmi-instance-autostart          Autostart flag for STRTCPSVR instance.
+  --ibmi-instance-ccsid=<ccsid>      CCSID for STRTCPSVR instance.
+  --ibmi-instance-node-path=<path>   Node.js binary path for STRTCPSVR instance.
+
+  Performs additional installation using config values and CLI options.
+  Default config file is <INSTALL_DIRECTORY>/config.js.
+
+  --config-file can be an absolute path or path relative to working directory.
+  --static-files are installed to directory specified in config file.
+  --static-files is invalid if directory exists or if a URL is specified.
+  --nodegit-version is ignored if --nodegit is not used.
+  --nodegit-version can accept an NPM package version, tag, or version range.
+
+  IBM i-related values are invalid when not installing on IBM i.
+  IBM i instance-related values are ignored unless --ibmi-instance is specified.
+
+  --ibmi-connector-library installs to library specified in config file.
+  --ibmi-instance creates STRTCPSVR config, if not already present.
+  --ibmi-instance-autostart sets/updates "autostart" in STRTCPSVR config.
+  --ibmi-instance-ccsid sets/updates "ccsid" in STRTCPSVR config.
+  --ibmi-instance-node-path sets/updates "nodePath" in STRTCPSVR config.
+  `;
+      console.log(HELP);
+      process.exit(0);
     }
-  });
-}
 
-function ask(questionParm, defaultAnswer, validationFunction, callback) {
-  var question = questionParm;
-  if (defaultAnswer == null) defaultAnswer = "";
-  if (typeof defaultAnswer !== "string") defaultAnswer = String(defaultAnswer);
-  
-  if (silent) {
-    callback(defaultAnswer);
-    return;
-  }
-  
-  if (defaultAnswer !== "") {
-    var lastChar = question.substr(question.length - 1, 1);
-    if (lastChar === ":" || lastChar === "?") {    
-      question = question.substr(0, question.length - 1) + " (" + defaultAnswer + ")" + lastChar;
+    // Initialize log file.
+    fs.mkdirSync(logDir);
+    logFile = fs.openSync(logPath, "w");
+
+    // Validate arguments.
+    if (args._.length > 0) {
+      logError("Unknown argument:", args._[0]);
+      die();
     }
-    else {
-      question = question + " (" + defaultAnswer + ")" + ":";
+
+    const deployDir = iutils.getDeployDir();
+    if (!deployDir) {
+      logError("Can't find deployment directory.");
+      die();
     }
-  }
-  question += " ";
 
-  
-  var readlineInterface = require('readline').createInterface({
-    input: process.stdin,
-    output: process.stdout,
-    terminal: false
-  });
+    const configPath = args["config-file"] !== undefined ? path.resolve(args["config-file"]) : iutils.getConfigPath();
+    if (!fileExists(configPath)) {
+      logError(`Configuration file ${configPath} not found.`);
+      die();
+    }
+    const config = require(configPath);
+
+    if (args["static-files"]) {
+      if (typeof config.staticFilesDirectory !== "string") {
+        logError("staticFilesDirectory is missing from config or is invalid.");
+        die();
+      }
+      if (/^https?:\/\//i.test(config.staticFilesDirectory)) {
+        logError("--static-files is not valid when staticFilesDirectory is a URL.");
+        die();
+      }
+      const staticDir = path.resolve(deployDir, config.staticFilesDirectory);
+      let exists = false;
+      try {
+        fs.statSync(staticDir);
+        exists = true;
+      }
+      catch (error) {}
+      if (exists) {
+        logError(`staticFilesDirectory ${staticDir} already exists.`);
+        die();
+      }
+    }
+    if (args["ibmi-connector-library"]) {
+      if (!IBMi) {
+        logError(`--ibmi-connector-library is not valid on ${os.platform()}`);
+        die();
+      }
+      if (typeof config.connectorLibrary !== "string") {
+        logError("connectorLibrary is missing from config or is invalid.");
+        die();
+      }
+      let error = iutils.validateIBMiName(config.connectorLibrary);
+      if (error) {
+        logError("connectorLibrary is invalid: " + error);
+        die();
+      }
+      if (config.connectorIASP !== undefined) {
+        error = iutils.validateIBMiIASP(config.connectorIASP);
+        if (error) {
+          logError("connectorIASP is invalid: " + error);
+          die();
+        }
+      }
+    }
+    if (args["ibmi-instance"] !== undefined) {
+      if (!IBMi) {
+        logError(`--ibmi-instance is not valid on ${os.platform()}`);
+        die();
+      }
+      let error = iutils.validateIBMiName(args["ibmi-instance"]);
+      if (error) {
+        logError("--ibmi-instance is invalid: " + error);
+        die();
+      }
+      if (args["ibmi-instance-ccsid"] !== undefined) {
+        error = iutils.validateIBMiCCSID(parseInt(args["ibmi-instance-ccsid"], 10));
+        if (error) {
+          logError("--ibmi-instance-ccsid is invalid: " + error);
+          die();
+        }
+      }
+      if (args["ibmi-instance-node-path"] !== undefined) {
+        const nodePath = args["ibmi-instance-node-path"].trim();
+        if (!fileExists(nodePath)) {
+          logError("--ibmi-instance-node-path is invalid: " + nodePath + " does not exist.");
+          die();
+        }
+      }
+    }
+
+    // Install nodegit, if necessary.
+    if (args["nodegit"]) {
+      let version;
+      if (args["nodegit-version"]) {
+        version = args["nodegit-version"];
+      }
+      else {
+        // Current stable version of nodegit doesn't have pre-built binaries for Node > 14.
+        // If installing on Node > 14, use alpha version with pre-built binaries.
+        version = "0.27.0"; // Current stable version.
+        if (compareVersions("14.*.*", process.versions.node) === -1) {
+          version = "0.28.0-alpha.18";
+        }
+      }
+      log(`Installing nodegit...`);
+      try {
+        child_process.execSync(
+          `npm install --no-package-lock nodegit@"${version}"`,
+          {
+            cwd: iutils.getPackageDir(),
+            stdio: ["ignore", logFile, logFile]
+          }
+        );
+      }
+      catch (error) {
+        logError("nodegit installation failed.");
+        die();
+      }
+    }
 
-  readlineInterface.question(question, function(answer) {
-    readlineInterface.close();
-    if (answer == "") answer = defaultAnswer;
-    answer = answer.trim();
-    if (typeof validationFunction === "function" && validationFunction(answer) === false) {
-      ask(questionParm, defaultAnswer, validationFunction, callback);
+    // Create modules directory.
+    if (directoryExists(path.join(deployDir, "modules"))) {
+      log("modules directory exists.");
     }
     else {
-      callback(answer);
+      log("Creating modules directory.");
+      fs.mkdirSync(path.join(deployDir, "modules"));
     }
-  });  
-}
 
-function fileExists(file) {
-  var exists = false;
-  try {
-    var stat = fs.statSync(file);
-    if (stat && stat.isFile()) exists = true;
-  }
-  catch (err) {
-    exists = false;
-  }
-  return exists;
-}
+    // Grant PROFOUNDJS user all permissions to modules directory tree.
+    if (IBMi) {
+      runCommand("CHGAUT OBJ('" + deployDir + "') USER(PROFOUNDJS) DTAAUT(*RWX) OBJAUT(*ALL)");
+      runCommand("CHGAUT OBJ('" + path.join(deployDir, "modules") + "') USER(PROFOUNDJS) DTAAUT(*RWX) OBJAUT(*ALL) SUBTREE(*ALL)");
+    }
 
-function directoryExists(dir) {
-  var exists = false;
-  try {
-    var stat = fs.statSync(dir);
-    if (stat && stat.isDirectory()) exists = true;
-  }
-  catch (err) {
-    exists = false;
-  }
-  return exists;
-}
+    // Create puiscreens.json.
+    createPuiscreens(deployDir);
 
-function copyFile(file, destination, type, process) {
-  if (type == null) type = "binary";
-  var fileParts = file.split(dirSep);
-  var fileName = fileParts[fileParts.length - 1];
-  if (directoryExists(destination))
-    var toFile = destination + dirSep + fileName;
-  else
-    var toFile = destination;
-  var content = fs.readFileSync(file, type);
-  if (typeof process === "function") content = process(content);
-  fs.writeFileSync(toFile, content, type);
-}
+    // Create puiuplexit.js.
+    if (fileExists(path.join(deployDir, "modules", "puiuplexit.js"))) {
+      log("puiuplexit.js file exists.");
+    }
+    else {
+      log("Creating puiuplexit.js.");
+      copyFile(path.join(__dirname, "modules", "puiuplexit.js"), path.join(deployDir, "modules"), "utf8");
+    }
 
-function copyDir(dir, destinationDir) {
-  var dirParts = dir.split(dirSep);
-  var dirName = dirParts[dirParts.length - 1];
-  fs.mkdirSync(destinationDir + dirSep + dirName);
-  files = fs.readdirSync(dir);
-  files.forEach(function(file, index) {
-    if(fs.lstatSync(dir + dirSep + file).isDirectory()) { // recurse
-      copyDir(dir + dirSep + file, destinationDir + dirSep + dirName);
-    } 
+    // Create puidnlexit.js.
+    if (fileExists(path.join(deployDir, "modules", "puidnlexit.js"))) {
+      log("puidnlexit.js file exists.");
+    }
     else {
-      copyFile(dir + dirSep + file, destinationDir + dirSep + dirName, null, null);
+      log("Creating puidnlexit.js.");
+      copyFile(path.join(__dirname, "modules", "puidnlexit.js"), path.join(deployDir, "modules"), "utf8");
     }
-  });
-}
 
+    // Create samples directory.
+    if (directoryExists(path.join(deployDir, "modules", "pjssamples"))) {
+      fs.removeSync(path.join(deployDir, "modules", "pjssamples"));
+    }
+    log("Copying pjssamples.");
+    copyDir(path.join(__dirname, "modules", "pjssamples"), path.join(deployDir, "modules"));
 
-function createPackageFile() {
-  if (IBMi)
-    runCommand("CHGAUT OBJ('" + deployDir + "') USER(PROFOUNDJS) DTAAUT(*RWX) OBJAUT(*ALL)");
+    // Create store_credentials.js.
+    if (fileExists(path.join(deployDir, "store_credentials.js"))) {
+      log("store_credentials.js file exists.");
+    }
+    else {
+      copyFile(path.join(__dirname, "store_credentials.js"), deployDir, "utf8");
+      log("store_credentials.js created.");
+    }
 
-  if (fileExists(deployDir + dirSep + "package.json")) {
-    console.log("package.json file exists.");
-  } 
-  else {    
-    copyFile(setupDir + dirSep + "package.json", deployDir, "utf8");
-    console.log("package.json created automatically with defaults.");
-  }
-}
+    // Create updatepui.js.
+    if (!IBMi) {
+      // This file is not needed on IBM i because the proper way to install Profound UI on IBM i is to download the full version from the web site
+      if (fileExists(path.join(deployDir, "updatepui.js"))) {
+        log("updatepui.js file exists.");
+      }
+      else {
+        copyFile(path.join(__dirname, "updatepui.js"), deployDir, "utf8");
+        log("updatepui.js created.");
+      }
+    }
+
+    // Create call.js.
+    if (fileExists(path.join(deployDir, "call.js"))) {
+      log("call.js file exists.");
+    }
+    else {
+      copyFile(path.join(__dirname, "call.js"), deployDir, "utf8");
+      log("call.js created.");
+    }
 
-function createStart(callback) {
-  if (fileExists(deployDir + dirSep + "start.js")) {
-    console.log("start.js file exists.");
+    // Convert start.js to Promises, if necessary.
     const convertStartJS = require("./convertStartJS.js");
-    const changed = convertStartJS(deployDir + dirSep + "start.js");
-    if (changed) {
-      console.log("start.js file converted to Promises.");
+    if (convertStartJS(path.join(deployDir, "start.js"))) {
+      log("start.js file converted to Promises.");
     }
-    callback();
-  } 
-  else {
-    copyFile(setupDir + dirSep + "start.js", deployDir, "utf8");
-    console.log("start.js created.");
-    callback();
-  }
-}
 
-function createCall(callback) {
-  if (fileExists(deployDir + dirSep + "call.js")) {
-      console.log("call.js file exists.");
-    callback();
-  } 
-  else {
-    copyFile(setupDir + dirSep + "call.js", deployDir, "utf8");
-    console.log("call.js created.");
-    callback();
-  }
-}
+    // Install Profound UI static files, if necessary.
+    if (args["static-files"]) {
+      log("");
+      log("Downloading Profound UI static files...")
+      const profound = require("profoundjs");
+      const zipFile = path.join(__dirname, "htdocs.zip");
+      const opts = {
+        follow_max: 15 // Follow redirects.
+      };
+      try {
+        await profound.utils.download(htdocs_download_url, zipFile, opts, process.stdout.isTTY ? process.stdout : null);
+        log("Download completed. Extracting...");
+        await extract(zipFile, { dir: path.resolve(deployDir, config.staticFilesDirectory) });
+        log("Directory " + config.staticFilesDirectory + " extracted.");
+      }
+      finally {
+        try {
+          fs.unlinkSync(zipFile);
+        }
+        catch {
+        }
+      }
+    }
+
+    // Install native IBM i components, if necessary.
+    if (IBMi) {
+      log("");
+      if (args["ibmi-connector-library"] || args["ibmi-instance"] !== undefined) {
+        let portNumber = config.port || 8081;
+        let connectorLibrary = "*NONE";
+        let connectorIASP;
+        if (args["ibmi-connector-library"]) {
+          connectorLibrary = config.connectorLibrary;
+          connectorIASP = config.connectorIASP || "*SYSBAS";
+        }
+        let svrname = "*NONE";
+        let autostart = true;
+        let ccsid = 37;
+        let nodePath = process.argv[0];
+        if (args["ibmi-instance"] !== undefined) {
+          svrname = args["ibmi-instance"].toUpperCase();
+          const instances = iutils.getIBMiInstances().filter(instance => instance.name === svrname);
+          if (instances.length > 0) {
+            const instance = instances[0];
+            let opt = getOpt("autostart");
+            if (opt) {
+              autostart = (opt.value === "1");
+            }
+            else {
+              autostart = false;
+            }
+            opt = getOpt("ccsid");
+            if (opt) {
+              ccsid = opt.value;
+            }
+            opt = getOpt("nodePath");
+            if (opt) {
+              nodePath = opt.value;
+            }
+            function getOpt(name) {
+              return instance.options.find(opt => opt.name === name);
+            }
+          }
+          if (process.argv.find(arg => arg.includes("ibmi-instance-autostart"))) { // minimist sets booleans to false if not passed.
+            autostart = args["ibmi-instance-autostart"];
+          }
+          if (args["ibmi-instance-ccsid"] !== undefined) {
+            ccsid = args["ibmi-instance-ccsid"];
+          }
+          if (args["ibmi-instance-node-path"] !== undefined) {
+            nodePath = args["ibmi-instance-node-path"];
+          }
+        }
+        // First, try copying the save file
+        var success = runCommand("CPYFRMSTMF FROMSTMF('" + __dirname + "/pjsdist.savf') TOMBR('/QSYS.LIB/QGPL.LIB/PJSDIST.FILE') MBROPT(*REPLACE)");
+        if (!success) {
+          logError("Unable to create installer save file.");
+          die();
+        }
+        // Now, try restoring the PJSINSTALL program
+        success = runCommand("RSTOBJ OBJ(PJSINSTALL) SAVLIB(QTEMP) DEV(*SAVF) OBJTYPE(*ALL) SAVF(QGPL/PJSDIST) RSTLIB(QGPL)");
+        if (!success) {
+          // Clean up save file
+          log("");
+          log("Cleaning up...");
+          runCommand("DLTF FILE(QGPL/PJSDIST)");
+          logError("Unable to restore installer save file.");
+          die();
+        }
+        // Now, try running PJSINSTALL
+        var command = "QGPL/PJSINSTALL CONNLIB(" + connectorLibrary + ")";
+        if (connectorLibrary != "*NONE")
+          command += " CONNIASP(" + connectorIASP + ") CONNHOST('localhost') CONNPORT(" + portNumber + ")";
+        command += " SVRNAME(" + svrname + ")";
+        if (svrname != "*NONE")
+          command += " SVRDIR('" + deployDir + "') " +
+            "SVRAUTO(" + ((autostart) ? "*YES" : "*NO") + ") CCSID(" + ccsid + ") NODEPATH('" + nodePath + "')";
+        success = runCommand(command, "-Ke");
+        // Clean up program and save file
+        log("");
+        log("Cleaning up...");
+        runCommand("DLTPGM PGM(QGPL/PJSINSTALL)");
+        runCommand("DLTCMD CMD(QGPL/PJSINSTALL)");
+        runCommand("DLTPNLGRP PNLGRP(QGPL/PJSINSTALL)");
+        runCommand("DLTMSGF MSGF(QGPL/PJSINSTALL)");
+        runCommand("DLTF FILE(QGPL/PJSDIST)");
+        if (!success) {
+          logError("PJSINSTALL command failed.");
+          die();
+        }
+      }
+    }
+    log(`\n${CYAN}Profound.js installation complete.${RESET}\n`);
 
-function createUpdatepui(callback) {
-  if (IBMi) {
-    // This file is not needed on IBM i because the proper way to install Profound UI on IBM i is to download the full version from the web site
-    callback();
-    return;
   }
-  if (fileExists(deployDir + dirSep + "updatepui.js")) {
-      console.log("updatepui.js file exists.");
-    callback();
-  } 
-  else {
-    copyFile(setupDir + dirSep + "updatepui.js", deployDir, "utf8");
-    console.log("updatepui.js created.");
-    callback();
+  catch (error) {
+    logError(error);
+    die();
   }
+})();
+
+function log(...args) {
+  console.log(...args);
+  logToFile(...args);
 }
 
-function createStoreCredentials(callback) {
+function logError(...args) {
+  console.error(...args);
+  logToFile(...args);
+}
 
-  if (fileExists(deployDir + dirSep + "store_credentials.js")) {
-    console.log("store_credentials.js file exists.");
-    callback();
-  } 
-  else {
-    copyFile(setupDir + dirSep + "store_credentials.js", deployDir, "utf8");
-    console.log("store_credentials.js created.");
-    callback();
-  }  
-  
+function logToFile(...args) {
+  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" });
 }
 
-function createModulesDirectory() {
-  if (directoryExists(deployDir + dirSep + "modules")) {
-    console.log("modules directory exists.");
-  }
-  else {
-    console.log("Creating modules directory.");
-    fs.mkdirSync(deployDir + dirSep + "modules");
-  }
+function die() {
+  logError(`\n${RED}Profound.js installation failed.${RESET}`);
+  console.error(`${RED}See installation log:${RESET} ${logPath}\n`);
+  process.exit(1);
+}
+
+function copyDir(dir, destinationDir) {
+  const dirName = path.basename(dir);
+  fs.mkdirSync(path.join(destinationDir, dirName));
+  const files = fs.readdirSync(dir);
+  files.forEach(function(file, index) {
+    if(fs.lstatSync(path.join(dir, file)).isDirectory()) { // recurse
+      copyDir(path.join(dir, file), path.join(destinationDir, dirName));
+    }
+    else {
+      copyFile(path.join(dir, file), path.join(destinationDir, dirName), null, null);
+    }
+  });
+}
 
-  // Make sure on IBMi that user PROFOUNDJS has full access everything within the Modules directory
-  if (IBMi)
-    runCommand("CHGAUT OBJ('" + deployDir  + dirSep + "modules') USER(PROFOUNDJS) DTAAUT(*RWX) OBJAUT(*ALL) SUBTREE(*ALL)");
+function copyFile(file, destination, type) {
+  if (type == null) type = "binary";
+  if (directoryExists(destination))
+    var toFile = path.join(destination, path.basename(file));
+  else
+    var toFile = destination;
+  var content = fs.readFileSync(file, type);
+  fs.writeFileSync(toFile, content, type);
 }
 
-function createPuiscreens() {
+function createPuiscreens(deployDir) {
   function copyFileOldVersionIs(version, compareStr){
     compareStr = compareStr || "=";
-    console.log("Found Standard puiscreens.json file version "+compareStr+" "+version+", replacing with current version...");
-    copyFile(setupDir + dirSep + "modules" + dirSep + "puiscreens.json", targetPuiScreensFile, "utf8");
-    console.log("puiscreens.json file was replaced.");
+    log("Found Standard puiscreens.json file version "+compareStr+" "+version+", replacing with current version...");
+    copyFile(path.join(__dirname, "modules", "puiscreens.json"), targetPuiScreensFile, "utf8");
+    log("puiscreens.json file was replaced.");
   }
 
   // Check which version of puiscreens.json is installed.
@@ -260,14 +484,14 @@ function createPuiscreens() {
   // 1. Check the SHA key of existing puiscreens.json.
   // 2. If it's an official PJS screen, no customizations have been made, so it's safe to replace with this version.
   // 3. If it's not an official version, check if we have lower case User & Password. If not, then backup existing version to puiscreens_bak.json and install this official version.
-  // 4. Otherwise it's not an official version but should work OK. So leave existing puiscreens.json, and check if we already have a puiscreens_orig.json, and 
+  // 4. Otherwise it's not an official version but should work OK. So leave existing puiscreens.json, and check if we already have a puiscreens_orig.json, and
   //    create it if not.
-  var targetPuiScreensFile = deployDir + dirSep + "modules" + dirSep + "puiscreens.json";
+  var targetPuiScreensFile = path.join(deployDir, "modules", "puiscreens.json");
   if (fileExists(targetPuiScreensFile)) {
 
     var data = fs.readFileSync(targetPuiScreensFile);
-    var checksum = crypto.createHash('sha512').update(data).digest('hex');  // sha512 best for 64-bit
-    
+    var checksum = crypto.createHash("sha512").update(data).digest("hex");  // sha512 best for 64-bit
+
     switch (checksum) {
       case "4fb38daa851aacd21cf3aeaa92304df4e0353cae2b6dab3a5fd53c0cf4d42875b5efadbb4bb29642cbff07bfdd8e1c7a9c107f582905f7fc798c3841e888ee61":
         copyFileOldVersionIs("4.6.1", "<=");
@@ -275,7 +499,7 @@ function createPuiscreens() {
       case "2e63c0e9816f52b515c45479ada102af806bc73b79d14109567500c529bfaa166fb981ddb6062a1ba0a7f8e36a11d674a955d2f003806f21165cb26ad0fbdf33":
         copyFileOldVersionIs("4.7.0");
         break;
-      
+
       case "b5eadc2df96e97de184cc331f133933c5f2945ab6c84997cfb30f2e6b478dfa6c8753bdb328b8257382f16a6d8e85b469af09f6d0eb872642300225590031c83":
         copyFileOldVersionIs("4.8.0");
         break;
@@ -284,7 +508,7 @@ function createPuiscreens() {
       case "b5e4d420d49d48c1dd08d0f50b88018fb64ee77248edcd9a656aee9f8ba723d0a91b18751f34cfc2efcd905f71834d5c2ac5cbff552fd85d164b710c3c2e079d":
         copyFileOldVersionIs("4.9.1");
         break;
-        
+
       case "1d469f6d2e4549dc259155a4b00d8f278ea89dc3566e18860ed9f6ccd406db8a47b0b3cbc359b397c59feac6faeb6a7fdc6ce2edbd3f120e295464dd41dd28f8":
         copyFileOldVersionIs("4.11.1");
         break;
@@ -307,22 +531,26 @@ function createPuiscreens() {
         break;
 
       case "af04803ac52709fd25f6fc87ff3ea309ad03ee6a9631f32511a5aa32c5ae50f34fd0e38e0d47dea223ac0c5dfb595199c623a83772af830edd21378055403e5c":
-        console.log("Found Standard puiscreens.json file version >= 6.0.0, no need for update.");
+        copyFileOldVersionIs("6.0.0");
+        break;
+
+      case "cd3e32138fbf1dac7755c233e1b5fc0d14f800694184c92989ddc5e62bacf86306013bcf423bf837183c979f61d6b323e0581363297ca6cf7f1b15435e0fbff5":
+        log("Found Standard puiscreens.json file version >= 6.0.0-beta.5, no need for update.");
         break;
-          
+
       default:
         var puiScreens = JSON.parse(data);
-        console.log("Found Customized puiscreens.json file, analyzing contents...");
+        log("Found Customized puiscreens.json file, analyzing contents...");
 
         // We need to check the signon screen and make sure we have lower case bound fields
         var goodUser = false, goodPassword = false, goodSubmit = false, goodError = false;
 
         formats:
-        for (i in puiScreens.formats) {
+        for (var i in puiScreens.formats) {
           var format = puiScreens.formats[i];
 
           if (format.screen["record format name"].toLowerCase() === "signonscrn") {
-            for (j in format.items) {
+            for (var j in format.items) {
               var itemValue = format.items[j].value;
               if (itemValue && typeof itemValue === "object") {
                 if (itemValue.fieldName === "ssuser") goodUser = true;
@@ -344,680 +572,84 @@ function createPuiscreens() {
         }
 
         if (goodUser && goodPassword && goodSubmit && goodError) {
-          console.log("The Customized puiscreens.json file is compatible, so leaving it in place. Creating puiscreens_orig.json");
-          copyFile(setupDir + dirSep + "modules" + dirSep + "puiscreens.json", deployDir + dirSep + "modules" + dirSep + "puiscreens_orig.json", "utf8");
-          console.log("puiscreens_orig.json created. For latest functionality, please migrate standard fields into your customized version.");
+          log("The Customized puiscreens.json file is compatible, so leaving it in place. Creating puiscreens_orig.json");
+          copyFile(path.join(__dirname, "modules", "puiscreens.json"), path.join(deployDir, "modules", "puiscreens_orig.json"), "utf8");
+          log("puiscreens_orig.json created. For latest functionality, please migrate standard fields into your customized version.");
         }
         else {
-          console.log("The Customized puiscreens.json file is NOT compatible, backing it up to puiscreens_bak.json...");
-          copyFile(deployDir + dirSep + "modules" + dirSep + "puiscreens.json", deployDir + dirSep + "modules" + dirSep + "puiscreens_bak.json", "utf8");
-          console.log("puiscreens_bak.json created. Creating puiscreens.json ...");
-          copyFile(setupDir + dirSep + "modules" + dirSep + "puiscreens.json", targetPuiScreensFile, "utf8");
-          console.log("puiscreens.json created. Please migrate standard fields into your customized version.");
+          log("The Customized puiscreens.json file is NOT compatible, backing it up to puiscreens_bak.json...");
+          copyFile(path.join(deployDir, "modules", "puiscreens.json"), path.join(deployDir, "modules", "puiscreens_bak.json"), "utf8");
+          log("puiscreens_bak.json created. Creating puiscreens.json ...");
+          copyFile(path.join(__dirname, "modules", "puiscreens.json"), targetPuiScreensFile, "utf8");
+          log("puiscreens.json created. Please migrate standard fields into your customized version.");
         }
     }
   }
   else {
-    console.log("Creating puiscreens.json.");
-    copyFile(setupDir + dirSep + "modules" + dirSep + "puiscreens.json", targetPuiScreensFile, "utf8");
-  }
-}
-
-function createPUIUPLEXIT() {
-  if (fileExists(deployDir + dirSep + "modules" + dirSep + "puiuplexit.js")) {
-    console.log("puiuplexit.js file exists.");
-  } 
-  else {
-    console.log("Creating puiuplexit.js.");
-    copyFile(setupDir + dirSep + "modules" + dirSep + "puiuplexit.js", deployDir + dirSep + "modules", "utf8");
-  }
-}
-
-function createPUIDNLEXIT() {
-  if (fileExists(deployDir + dirSep + "modules" + dirSep + "puidnlexit.js")) {
-    console.log("puidnlexit.js file exists.");
-  } 
-  else {
-    console.log("Creating puidnlexit.js.");
-    copyFile(setupDir + dirSep + "modules" + dirSep + "puidnlexit.js", deployDir + dirSep + "modules", "utf8");
+    log("Creating puiscreens.json.");
+    copyFile(path.join(__dirname, "modules", "puiscreens.json"), targetPuiScreensFile, "utf8");
   }
 }
 
-function copyPjssamples() {
-  if (directoryExists(deployDir + dirSep + "modules" + dirSep + "pjssamples"))
-    fse.removeSync(deployDir + dirSep + "modules" + dirSep + "pjssamples");
-  console.log("Copying pjssamples.");
-  copyDir(setupDir + dirSep + "modules" + dirSep + "pjssamples",  deployDir + dirSep + "modules");    
-}
-
-function validateName(name) {
-
-  name = name.trim().toUpperCase();
-  var firstChar = name.substr(0, 1);  
-
-  if ((firstChar < "A" || firstChar > "Z") && firstChar != "#" && firstChar != "@" && firstChar != "$") {
-    console.log("Name must start with an alpha character.");
-    return false;
-  }
-  for (var i = 1; i < name.length; i++) {
-    var chr = name.substr(i, 1);
-    if ((chr < "A" || chr > "Z") && (chr < "0" || chr > "9") && chr != "#" && chr != "@" && chr != "$" && chr != "_" && chr != ".") {
-      console.log("Name contains invalid characters.");
-      return false;
-    }        
-  }
-
-  if (name.length > 10) {
-    console.log("Name must be 10 characters or less.");
-    return false;
+function directoryExists(dir) {
+  var exists = false;
+  try {
+    var stat = fs.statSync(dir);
+    if (stat && stat.isDirectory()) exists = true;
   }
-
-  return true;
-}
-
-function validateIASP(name) {
-
-  if (name.trim().toUpperCase() == "*SYSBAS")
-    return true;
-  else return validateName(name);
-
-}
-
-function isURL(path) {
-  if (typeof path !== "string") return false;
-  path = path.toLowerCase();
-  if (path.substr(0, 7) === "http://") return true;
-  if (path.substr(0, 8) === "https://") return true;
-  return false;
-}
-
-function validateDirectory(directory) {
-  if (IBMi) {
-    var ch = directory.substr(0, 1);
-    if (ch !== "/" && ch !== "\\" && !isURL(directory)) {
-      directory = deployDir + dirSep + directory;
-    }
-    if (!directoryExists(directory) && !isURL(directory)) {
-      console.log("WARNING: The specified directory was not found. You can create it later or modify the staticFilesDirectory property in config.js.");
-      console.log("");
-    }
+  catch (err) {
+    exists = false;
   }
-  return true;  // accept any entry - if directory doesn't exist, simply warn
-}
-
-function validatePort(port) {
-  if (port === "0") return true;
-  port = Number(port);
-  if (!isNaN(port) && port >= 1 && port <= 65535) return true;
-  console.log("Invalid port number. Valid range is 0-65535.");
-  return false;
+  return exists;
 }
 
-
-function isValidNodePath(nodePath) {
-
-  if (!fileExists(nodePath)) {
-    console.log("Path " + nodePath + " does not exist. A valid path name must be entered.");
-    return false;
+function fileExists(file) {
+  var exists = false;
+  try {
+    var stat = fs.statSync(file);
+    if (stat && stat.isFile()) exists = true;
   }
-  return true;
-}
-
-
-function isValidCcsid(ccsid) {
-
-  ccsid = Number(ccsid);
-  if (isNaN(ccsid)) {
-    console.log("Invalid CCSID. A numeric value is required.");
-    return false;
+  catch (err) {
+    exists = false;
   }
-
-  // Here's the list of valid CCSID's that can be used for jobs on IBM i
-  if ([37, 256, 273, 277, 278, 280, 284, 285, 290, 297, 420, 423, 424, 425, 500, 833, 836, 838, 870, 871, 875, 880,
-        905, 918, 924, 930, 933, 935, 937, 939, 1025, 1026, 1027, 1047, 1097, 1112, 1122, 1123, 1130, 1132, 1137,
-        1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149, 1153, 1154, 1155, 1156, 1157, 1158, 1160, 1164,
-        1166, 1175, 1364, 1371, 1377, 1388, 1399, 4971, 5026, 5035, 5123, 5233, 8612, 9030, 12708, 13121, 13124,
-        28709, 57777, 61175, 62211, 62224, 62235, 62245, 62251].indexOf(ccsid) > -1)
-    return true;
-
-  console.log("Value " + ccsid + " is not a valid CCSID for the SBMJOB command.");
-
-  return false;
-}
-
-function validateYesNo(answer) {
-  answer = answer.toUpperCase();
-  if (answer === "Y" || answer === "YES" || answer === "N" || answer === "NO") return true;
-  console.log("Invalid answer. Use y or n.");
-  return false;
+  return exists;
 }
 
-function getConnectorLibrary() {
-
-  var ret = {};
-  if (fileExists(deployDir + dirSep + "config.js")) {
-
-    const config = require(deployDir + dirSep + "config.js");
+function runCommand(command, switches) {
 
-    if (config.connectorLibrary) {
-      ret.name = config.connectorLibrary;
-      if (config.connectorIASP)
-        ret.IASP = config.connectorIASP;
-    }
+  log("Executing IBM i command: " + command);
+  var args = [command];
+  if (typeof switches == "string") {
+    args.unshift(switches);
   }
-
-  return ret;
-}
-
-function createConfig(profounduiLibrary, connectorLibrary, connectorIASP, callback) {
-
-  if (fileExists(deployDir + dirSep + "config.js")) {
-
-    // If the config already exists, check if any settings need to be updated
-
-    if (!IBMi) {
-      console.log("config.js file exists.");
-      callback();
-      return;
-    }
-
-    const config = require(deployDir + dirSep + "config.js");
-    var isConfigChanged = false;
-    
-    // Check if it contains a profounduiLibrary setting
-    if (profounduiLibrary) {
-
-      var configProfounduiLibrary = getProfounduiLibrary();
-
-      if (configProfounduiLibrary) {
-      
-        if (configProfounduiLibrary !== profounduiLibrary) {
-          isConfigChanged = true;
-          console.log("Updating profounduiLibrary setting in config.js from " + configProfounduiLibrary + " to " + profounduiLibrary + "...");
-          config.profounduiLibrary = profounduiLibrary;
-        }
-
-      }
-      else {
-        isConfigChanged = true;
-        console.log("config.js file exists, but does not have a profounduiLibrary setting, creating one now...");
-        config.profounduiLibrary = profounduiLibrary;
-      }
-    }
-
-
-    // Check if it contains a connectorLibrary setting
-    if (connectorLibrary && connectorLibrary !== "*NONE") {
-
-      var configConnectorLibrary = getConnectorLibrary();
-
-      if (configConnectorLibrary.name) {
-      
-        if (configConnectorLibrary.name !== connectorLibrary) {
-          isConfigChanged = true;
-          console.log("Updating connectorLibrary setting in config.js from " + configConnectorLibrary.name + " to " + connectorLibrary + "...");
-          config.connectorLibrary = connectorLibrary;
-        }
-
-      }
-      else {
-        isConfigChanged = true;
-        console.log("config.js file exists, but does not have a connectorLibrary setting, creating one now...");
-        config.connectorLibrary = connectorLibrary;
-      }
-
-      // Check if it contains a connectorIASP setting
-      if (connectorIASP) {
-
-        if (configConnectorLibrary.IASP) {
-
-          if (configConnectorLibrary.IASP !== connectorIASP) {
-            isConfigChanged = true;
-            console.log("Updating connectorIASP setting in config.js from " + configConnectorLibrary.IASP + " to " + connectorIASP + "...");
-            if (connectorIASP == "*SYSBAS")
-              delete config.connectorIASP;
-            else
-              config.connectorIASP = connectorIASP;
-          }
-
-        }
-        else if (connectorIASP != "*SYSBAS") {
-          isConfigChanged = true;
-          console.log("config.js file exists, but does not have a connectorIASP setting, creating one now...");
-          config.connectorIASP = connectorIASP;
-        }
-      }
-
-    }
-
-
-
-    // Update config.js if we made any chanegs
-    if (isConfigChanged) {
-
-      fs.writeFile(deployDir + dirSep + "config.js", stringifyConfig(config), (err) => {
-        if (err) 
-          console.log('An error occurred updating config.js file : ' + err);
-        else
-          console.log('config.js file has been updated.');
-        callback();
-      });
-    }
-    else
-      callback();
+  else {
+    args.unshift("-e");
   }
-  else {    
-    
-    var defaultStaticDir = "htdocs";
-    if (IBMi) {
-      defaultStaticDir = "/www/profoundui/htdocs";
-      if (!directoryExists(defaultStaticDir)) {
-        console.log("WARNING: Profound UI Installation not found in default location.");
-      }
-    }
-    else {
-      console.log("");
-      console.log("You can provide the Profound UI directory as a remote URL (e.g. http://myibmi:8080) or as a local directory name. If the directory does not exist, the installer can create it for you.");
-      console.log("");
-    }
-    
-    ask("Specify Profound UI static files directory", defaultStaticDir, validateDirectory, function(staticDir) {
-      ask("Specify port number for Profound.js server", portNumber, validatePort, function(newPortNumber) {
-        copyFile(setupDir + dirSep + "config.js", deployDir, "utf8", function(content) {
-          var config = content.substr(content.indexOf("{"));
-          eval("config = " + config);
-          config.staticFilesDirectory = staticDir;
-          config.port = Number(newPortNumber);
-          if (connectorLibrary && connectorLibrary !== "*NONE") {
-            config.connectorLibrary = connectorLibrary;
-            if (connectorIASP != "*SYSBAS")
-              config.connectorIASP = connectorIASP;
-          }
-          if (profounduiLibrary)
-            config.profounduiLibrary = profounduiLibrary;
-
-          if (IBMi)
-            config.showIBMiParmDefn = true;
-
-          // Check if this is a workspace (if so, default to mysql)
-          if (!IBMi && fileExists(deployDir + dirSep + "modules"  + dirSep + "app" + dirSep + ".noderun" + dirSep + "settings.json")) {
-            if (config.databaseConnections) delete config.databaseConnections;  // remove property so that it's appended at the end when we set it
-            config.databaseConnections = [{
-              name: "default",
-              default: true,
-              driver: "mysql",
-              driverOptions: {
-                user: "user-name",
-                password: "your-password",
-                host: "localhost",
-                database: "database-name"
-              }
-            }];
-          }
 
-          portNumber = newPortNumber;
-          content = "\nmodule.exports = ";
-          content += JSON.stringify(config, null, "  ");
-          content += "\n";
-          return content;
-        });
-        console.log("");
-        console.log("config.js created.");
-        console.log("");
-        
-        if (!IBMi && !isURL(staticDir)) {
-          var absoluteStaticDir = path.resolve(deployDir, staticDir);
-          if (!directoryExists(absoluteStaticDir)) {
-            console.log("");
-            console.log("The specified directory for Profound UI was not found.");
-            ask("Should the installer create the directory and download a copy of Profound UI static files?", "y", validateYesNo, function(answer) {
-              if (answer.toUpperCase() == "Y") {
-                downloadHtdocs(absoluteStaticDir, callback);
-              }
-              else {
-                callback();
-              }
-            });
-          }
-          else {        
-            callback();
-          }
-        }
-        else {
-          callback();
-        }
-      });
-    });
-  }
-}
+  const options = {
+    stdio: ["ignore", logFile, logFile],
+    cwd: __dirname,
+    env: {
+      QIBM_USE_DESCRIPTOR_STDIO: "Y",
+      QIBM_MULTI_THREADED: "N" // Many IBM commands cannot run in multi-threaded mode...
+  }};
 
-function finish() {
-  process.stdin.destroy();
-  console.log("");
-  process.exit(0);
-}
+  const results = child_process.spawnSync("system", args, options);
 
-function runCommand(command, switches) {
-  console.log("");
-  console.log("Executing command: " + command);
-  const child_process = require("child_process");
-  var args = [command];
-  if (typeof switches == "string")
-    args.unshift(switches);
-  else 
-    args.unshift("-e");
-  
-  // Many IBM commands cannot run in multi-threaded mode...
-  var options = {stdio: "inherit", cwd: setupDir, env: {QIBM_USE_DESCRIPTOR_STDIO:"Y", QIBM_MULTI_THREADED:"N"}};
-  
-  var results = child_process.spawnSync(
-    "system",
-    args,
-    options);
-    
-  var code = results.status;
-  var signal = results.signal;
-
-  if (code != null) {    
+  const code = results.status;
+  const signal = results.signal;
+  if (code != null) {
     if (code === 0) {
-      console.log("Command finished successfully.");
       return true;
     }
     else {
-      console.log("Process exited, code %d", code);
+      logError("Process exited, code %d", code);
     }
   }
   else {
-    console.log("Process ended due to signal %s", signal);
-    console.log(results);  // show full results including detailed error
+    logError("Process ended due to signal %s", signal);
+    logError(results);  // show full results including detailed error
   }
   return false;
-}
-
-
-function getProfounduiLibrary() {
-
-  if (fileExists(deployDir + dirSep + "config.js")) {
-
-    const config = require(deployDir + dirSep + "config.js");
-
-    if (config.profounduiLibrary) {
-      return config.profounduiLibrary;
-    }
-  }
-
-  return null;
-}
-
-
-function askPuiLibrary(callback) {
-
-  var defaultProfounduiLibrary = getProfounduiLibrary();
-
-  ask("Specify Profound UI installation library", (defaultProfounduiLibrary) ? defaultProfounduiLibrary : "PROFOUNDUI", validateName, function(puiLibrary) {
-    callback(puiLibrary.trim().toUpperCase());
-  });
-
-}
-
-
-function askConnector(callback) {
-
-  ask("Install Profound.js Connector IBM i ILE components?", "y", validateYesNo, function(answer) {
-  
-    if (answer.toUpperCase() == "Y") {
-      
-      var connectorLibrary = getConnectorLibrary();
-      ask("Enter Profound.js Connector library name:", (connectorLibrary.name) ? connectorLibrary.name : "PROFOUNDJS", validateName, function(answer) {
-      
-        var name = answer.trim().toUpperCase();
-        ask("Enter Profound.js Connector library IASP:", (connectorLibrary.IASP) ? connectorLibrary.IASP : "*SYSBAS", validateIASP, function(answer) {
-
-          callback(name, answer.trim().toUpperCase());
-
-        });
-
-      });
-      
-    }
-    else {
-      
-      callback("*NONE");
-      
-    }
-  
-  });
-}
-
-
-function getServerInstances(instanceRootDir) {
-
-  const serverInstances = [];
-  if (directoryExists(pjsBaseInstance)) {
-    
-    const instanceDirs = fs.readdirSync(pjsBaseInstance);
-    instanceDirs.forEach((instanceDir) => {
-      
-      let data
-      try {
-        
-        data = fs.readFileSync(path.join(pjsBaseInstance, instanceDir, "/conf"), "utf8");
-      
-      }
-      catch (error) {
-        
-        return;
-        
-      }
-      let options = data.split('\n');
-      let config = { name: instanceDir, autostart: "n", ccsid: 37, nodePath: "/QOpenSys/pkgs/bin/node" };
-
-      options.forEach(option => {
-
-        let parts = option.split('=');
-        let configOption = parts[0].trim();
-
-        switch (configOption) {
-          case 'path':
-            config.path = parts[1].trim();
-            break;
-          case 'nodePath':
-            config.nodePath = parts[1].trim();
-            break;
-          case 'nodeArgs':
-            config.nodeArgs = parts[1].trim();
-            break;
-          case 'autostart':
-            config.autostart = (parts[1].trim() === '1') ? 'y' : 'n';
-            break;
-          case 'ccsid':
-            config.ccsid = parts[1].trim();
-            break;
-          case '':
-            break;
-          default:
-            break;
-        }
-      });
-      if (config.path === instanceRootDir + dirSep + 'start.js')
-        serverInstances.push(config);
-      
-    });
-  
-  }
-  if (serverInstances.length === 0)
-    serverInstances.push({ name: "PROFOUNDJS", autostart: "y", ccsid: 37, nodePath: "/QOpenSys/pkgs/bin/node" });
-  return serverInstances;
-
-}
-
-
-function askServerInstance(callback) {
-
-  serverInstances = getServerInstances(deployDir);
-
-  if (serverInstances.length > 1) {
-    console.log('\nWARNING - Multiple STRTCPSVR/ENDTCPSVR instances found for this server in ' + pjsBaseInstance + ' : -\n');
-    serverInstances.forEach(serverInstance => {
-      console.log(JSON.stringify(serverInstance));
-    });
-  }
-
-  ask("\nCreate/replace server instance configuration for STRTCPSVR/ENDTCPSVR commands?", "y", validateYesNo, function(answer) {
-
-    if (answer.toUpperCase() == "Y") {
-
-      ask("Server instance name:", serverInstances[0].name.toUpperCase(), validateName, function(answer) {
-
-        var svrname = answer.trim().toUpperCase();
-
-        ask("Specify CCSID for instance " + svrname, serverInstances[0].ccsid, isValidCcsid, function(ccsid) {
-
-          ask("Specify Node.js path for instance " + svrname, serverInstances[0].nodePath, isValidNodePath, function(nodePath) {
-
-            ask("Autostart server instance " + svrname + " when TCP/IP starts?", serverInstances[0].autostart, validateYesNo, function(answer) {
-
-              var autostart = (answer.toUpperCase() == "Y");
-              callback(svrname, autostart, ccsid, nodePath);
-
-            });
-          });
-        });
-      });
-
-    }
-    else {
-
-      callback("*NONE");
-
-    }
-
-  });
-}
-
-
-function stringifyConfig(config) {
-
-  // JavaScript functions (like connectorIPFilter) will be lost when doing JSON.stringify,
-  // so we need to do some magic to preserve them.
-  
-  let funkz = [];
-  let configString = "\nmodule.exports = ";
-
-  configString += JSON.stringify(config, (key, val) => {
-      if (typeof val === 'function') {
-        let n = funkz.length;
-        funkz.push(val.toString());
-        return `___function${n}___`;
-      }
-      return val;
-  }, "  ");
-  
-  configString += "\n";
-
-  for (var i=0; i<funkz.length; i++) {
-    configString = configString.replace(`"___function${i}___"`, funkz[i]);
-  }
-
-  return configString;
-
-}
-
-
-if (["win32", "darwin", "linux"].includes(os.platform()))
-  installNodeGit();
-createPackageFile();
-createModulesDirectory();
-createPuiscreens();
-createPUIUPLEXIT();
-createPUIDNLEXIT();
-copyPjssamples();
-
-createStoreCredentials(function() {
-  createUpdatepui(function() {
-    createCall(function() {
-      createStart(function() {
-        if (IBMi && !silent) {
-          console.log("");
-          askPuiLibrary(function(profounduiLibrary) {
-            askConnector(function(connectorLibrary, connectorIASP) {
-              createConfig(profounduiLibrary, connectorLibrary, connectorIASP, function() {
-                askServerInstance(function(svrname, autostart, ccsid, nodePath) {
-                  if (connectorLibrary != "*NONE" || svrname != "*NONE") {
-                    // First, try copying the save file
-                    var success = runCommand("CPYFRMSTMF FROMSTMF('" + setupDir + dirSep + "pjsdist.savf') TOMBR('/QSYS.LIB/QGPL.LIB/PJSDIST.FILE') MBROPT(*REPLACE)");
-                    if (success) {
-                      // Now, try restoring the PJSINSTALL program
-                      success = runCommand("RSTOBJ OBJ(PJSINSTALL) SAVLIB(QTEMP) DEV(*SAVF) OBJTYPE(*ALL) SAVF(QGPL/PJSDIST) RSTLIB(QGPL)");
-                      if (success) {
-                        // Now, try running PJSINSTALL
-                        var command = "QGPL/PJSINSTALL CONNLIB(" + connectorLibrary + ")";
-                        if (connectorLibrary != "*NONE")
-                          command += " CONNIASP(" + connectorIASP + ") CONNHOST('localhost') CONNPORT(" + portNumber + ")";
-                        command += " SVRNAME(" + svrname + ")";
-                        if (svrname != "*NONE")
-                          command += " SVRDIR('" + deployDir + "') " +
-                            "SVRAUTO(" + ((autostart) ? "*YES" : "*NO") + ") CCSID(" + ccsid + ") NODEPATH('" + nodePath + "')";
-                        success = runCommand(command, "-Ke");
-                        // Clean up program and save file
-                        console.log("");
-                        console.log("Cleaning up...");
-                        runCommand("DLTPGM PGM(QGPL/PJSINSTALL)");
-                        runCommand("DLTCMD CMD(QGPL/PJSINSTALL)");
-                        runCommand("DLTPNLGRP PNLGRP(QGPL/PJSINSTALL)");
-                        runCommand("DLTMSGF MSGF(QGPL/PJSINSTALL)");
-                        runCommand("DLTF FILE(QGPL/PJSDIST)");
-                        console.log("");
-                        if (success) {
-                          console.log("Profound.js successfully installed.");
-                        }
-                        else {
-                          console.log("Profound.js did NOT install successfully! Check messages above.");
-                        }
-                      }
-                      else {
-                        // Clean up save file
-                        console.log("");
-                        console.log("Cleaning up...");
-                        runCommand("DLTF FILE(QGPL/PJSDIST)");
-                        console.log("");
-                        console.log("Profound.js did NOT install successfully! Check messages above.");
-                      }
-                    }
-                    else {
-                      console.log("");
-                      console.log("Profound.js did NOT install successfully! Check messages above.");
-                    }
-                    finish();
-                  }
-                  else {
-                    finish();
-                  }
-                });
-              });
-            });
-          });
-        }
-        else {
-          createConfig(null, null, null, function() {
-            console.log("");
-            console.log("Installation completed.");
-            finish();
-          });
-        }
-      });
-    });
-  });
-});
-
-function installNodeGit() {
-
-  child_process.execSync(
-    "npm install nodegit",
-    {
-      cwd: path.resolve(__dirname, ".."),
-      stdio: ["ignore", "inherit", "inherit"]
-    }
-  );
 
 }