Merge pull request #2408 from adaptlearning/issue/2407

Allow non-interactive install and upgrade scripts

Author: tomgreenfield

install.js

@@ -261,6 +261,9 @@ installHelpers.checkPrimaryDependencies(function(error) {
       ]
     };
     if(!IS_INTERACTIVE) {
+      if (installHelpers.inputHelpers.toBoolean(optimist.argv.useJSON)) {
+        USE_CONFIG = true;
+      }
       return start();
     }
     console.log('');
@@ -282,7 +285,8 @@ installHelpers.checkPrimaryDependencies(function(error) {
 function generatePromptOverrides() {
   if(USE_CONFIG) {
     var configJson = require('./conf/config.json');
-    var configData = JSON.parse(JSON.stringify(configJson).replace(/true/g, '"y"').replace(/false/g, '"n"'));
+    var configData = JSON.parse(JSON.stringify(configJson).replace(/:true/g, ':"y"').replace(/:false/g, ':"n"'));
+    addConfig(configData);
     configData.install = 'y';
   }
   const sessionSecret = USE_CONFIG && configData.sessionSecret || crypto.randomBytes(64).toString('hex');
@@ -345,7 +349,7 @@ function configureDatabase(callback) {
   installHelpers.getInput(inputData.database.dbConfig, function(result) {
     addConfig(result);
 
-    var isStandard = !result.useConnectionUri || USE_CONFIG && configResults.useConnectionUri !== 'y';
+    var isStandard = !installHelpers.inputHelpers.toBoolean(result.useConnectionUri);
     var config = inputData.database[isStandard ? 'configureStandard' : 'configureUri'];
 
     installHelpers.getInput(config, function(result) {
@@ -360,14 +364,14 @@ function configureFeatures(callback) {
     function smtp(cb) {
       installHelpers.getInput(inputData.features.smtp.confirm, function(result) {
         addConfig(result);
-        if(!result.useSmtp || USE_CONFIG && configResults.useSmtp !== 'y') {
+        if (!installHelpers.inputHelpers.toBoolean(result.useSmtp)) {
           return cb();
         }
         // prompt user if custom connection url or well-known-service should be used
         installHelpers.getInput(inputData.features.smtp.confirmConnectionUrl, function(result) {
           addConfig(result);
           var smtpConfig;
-          if (result.useSmtpConnectionUrl === true) {
+          if (installHelpers.inputHelpers.toBoolean(result.useSmtpConnectionUrl)) {
             smtpConfig = inputData.features.smtp.configure.concat(inputData.features.smtp.configureConnectionUrl);
           } else {
             smtpConfig = inputData.features.smtp.configure.concat(inputData.features.smtp.configureService);

lib/installHelpers.js

@@ -41,6 +41,21 @@ var inputHelpers = {
     */
     readline.moveCursor(process.stdout, 0, -1);
     return v;
+  },
+  isFalsyString: function(v) {
+    if (typeof v !== 'string') return false;
+    switch (v.trim()) {
+      case '':
+      case 'N':
+      case 'n':
+      case 'false':
+      case 'null':
+      case 'undefined':
+      case '0':
+        return true;
+      default:
+        return false;
+    }
   }
 };
 

upgrade.js

@@ -142,7 +142,7 @@ function checkForUpdates(callback) {
 function doUpdate(data) {
   async.series([
     function upgradeAuthoring(cb) {
-      if(!data.adapt_authoring) {
+      if (installHelpers.inputHelpers.isFalsyString(data.adapt_authoring)) {
         return cb();
       }
       installHelpers.updateAuthoring({
@@ -159,7 +159,7 @@ function doUpdate(data) {
       });
     },
     function upgradeFramework(cb) {
-      if(!data.adapt_framework) {
+      if (installHelpers.inputHelpers.isFalsyString(data.adapt_framework)) {
         return cb();
       }
       var dir = path.join(configuration.tempDir, configuration.getConfig('masterTenantID'), OutputConstants.Folders.Framework);