Fixed installCmd as array

forge · Nov 2, 2015 · 2da7f28 · 2da7f28
1 parent 4d42fab
commit 2da7f28
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/app/views/addons_page.html b/app/views/addons_page.html
@@ -62,7 +62,9 @@ <h2>About</h2>
 					<div class="col-xs-12 author-div">
 						<h2>Installation instructions</h2>
 						<p>In the Forge CLI:</p>
-						<code>{{addon.installCmd}}</code>
+						<p ng-repeat="cmd in addon.installCmd">
+							<code>{{cmd}}</code>
+						</p>
 					</div>
 				</div>
 

diff --git a/server.js b/server.js
@@ -11,8 +11,8 @@ var cc          = require('config-multipaas'),
     exec        = require('child_process').exec,
     moment      = require('moment'),
     cheerio     = require('cheerio'),
-    asciidoctor = require('asciidoctor.js')();
-
+    asciidoctor = require('asciidoctor.js')(),
+    util = require('util');
 // Git utilities
 var Git         = 
     { 
@@ -258,6 +258,9 @@ function allAddons() {
             .map(function (item) {
                 item.type = 'community';
                 item.installCmd = (item.installCmd || 'addon-install-from-git --url '+item.repo+' --coordinate '+item.id+ (item.ref != 'master' ? ' --ref '+item.ref : ''));
+                if (!util.isArray(item.installCmd)) {
+                    item.installCmd = [item.installCmd];
+                }
                 if (item.tags) {
                     item.tags = item.tags.split(',').map(function(elem){return elem.trim().toLowerCase();});
                 }
@@ -267,6 +270,9 @@ function allAddons() {
             .map(function (item) {
                 item.type = 'core';
                 item.installCmd = (item.installCmd || 'addon-install --coordinate '+item.id);
+                if (!util.isArray(item.installCmd)) {
+                    item.installCmd = [item.installCmd];
+                }                
                 if (item.tags) {
                     item.tags = item.tags.split(',').map(function(elem){return elem.trim().toLowerCase();});
                 }