Merge branch 'master' of jeffery/elxr into master

index.js

@@ -313,6 +313,9 @@ shell_verse.acquireElevationState().then((isElevated) => {
       , noprerequisites : true
       , independentcmd : true
       // , requires : [ generateDependencies ]
+      , toArgs : function( o ){ 
+        return o
+      }
     }
     , 'remote set-url' : {
       // return a interpreted set of arguments for this cmd run context.
@@ -321,6 +324,7 @@ shell_verse.acquireElevationState().then((isElevated) => {
       , noprerequisites : true
       , independentcmd : true
       // , requires : [ generateDependencies ]
+      
     }
     , 'remote add' : {
       // return a interpreted set of arguments for this cmd run context.
@@ -350,7 +354,7 @@ shell_verse.acquireElevationState().then((isElevated) => {
             var repodef = selectedinstance.reposindexed[repo];
             if(!repodef) return
   
-            var remotenames = selectedinstance.selectedremotes.concat( selectedinstance.permanentremotes )
+            var remotenames = (selectedinstance.selectedremotes || []).concat( selectedinstance.permanentremotes )
             var remotes = selectedinstance.reposerverinstances[selectedinstance.reposerver].remotes
             // console.log('-----------------------------------------------------')
             // console.log(repo)
@@ -562,9 +566,9 @@ shell_verse.acquireElevationState().then((isElevated) => {
   var interpretrun = function(){
     var cmd = processedArgs._[0];
     return cmds[cmd] && cmds[cmd].interpret ? cmds[cmd].interpret() : (function(){  
-      return cmds[cmd]  = interpret.call({ cmd, toArgs : function( o ){ 
+      return cmds[cmd] = utils.assign(cmds[cmd], interpret.call({ cmd, toArgs : function( o ){ 
         // PB : TODO -- need to call this before selectedinstance is built. The instanceName is dependent on the specific cmd.
-        return o } })
+        return o } }))
     })() 
   }
 
@@ -1613,7 +1617,7 @@ shell_verse.acquireElevationState().then((isElevated) => {
             return tasq;
           }
 
-          var remotenames = selectedinstance.selectedremotes.concat( selectedinstance.permanentremotes )
+          var remotenames = (selectedinstance.selectedremotes || []).concat( selectedinstance.permanentremotes )
           var remotes = selectedinstance.reposerverinstances[__args.url].remotes
 
           // use the repo manifest to create missing remotes.
@@ -1623,17 +1627,23 @@ shell_verse.acquireElevationState().then((isElevated) => {
             if(repo === '.elxr') return Promise.resolve(true)
             if(repo === '.git') return Promise.resolve(true)
             if(repo === 'Downloads') return Promise.resolve(true)
+            // if(repo !== 'elixir-config-development') {
+              
+              // PB : TODO -- pick up remote definitions per repository...
+              var reposmanfiest = utils.assign_core( { keycase : true, arraymergetype : utils.assign_core.DISTINCT_UNION }
+                , {}, selectedinstance, loadmanifest( selectedinstance.root + '/' + repo
+                , { utils, username : selectedinstance.username, instanceName : selectedinstance.instanceName
+                , node_env : selectedinstance.node_env, reposerver : selectedinstance.reposerver }
+              ))
+            // }
+            // else {
+            //   var reposmanfiest= { error : 'Already lodeded elixir-config-development'}
+            // }
 
-            // PB : TODO -- pick up remote definitions per repository...
-            var reposmanfiest = utils.assign_core( { keycase : true, arraymergetype : utils.assign_core.DISTINCT_UNION }
-              , {}, selectedinstance, loadmanifest( selectedinstance.root + '/' + repo
-              , { utils, username : selectedinstance.username, instanceName : selectedinstance.instanceName
-              , node_env : selectedinstance.node_env, reposerver : selectedinstance.reposerver }
-            ))
 
             if( !reposmanfiest.error ) {
               var reporemotenames = remotenames.concat(reposmanfiest.selectedremotes || []).concat( reposmanfiest.permanentremotes || [] )
-              var reporemotes = utils.assign(remotes, reposmanfiest.reposerverinstances[___args.url].remotes)
+              var reporemotes = utils.assign([], remotes, reposmanfiest.reposerverinstances[___args.url].remotes)
             }
             else {
               var reporemotenames = remotenames