Merge branch 'master' into develop

Author: Johnny Hausman

lib/generators/adn.js

@@ -13,7 +13,7 @@ var Command = new Generator({
     commandHelp: 'Generate an appdev config file (.adn) in your current directory.',
     parameters:[''],
     newText:'Creating appdev config file ...',
-    usesTemplates:false,
+    // usesTemplates:false,
     atRoot:false    // don't operate from the root directory!
 });
 

lib/generators/install.js

@@ -630,9 +630,10 @@ console.log('... well im here!');
         //    mv canjs-master assets/can
         listInstall.push({ command:'curl',  options:[ '-o',  path.join('assets', 'javascriptmvc.zip'), 'http://www.javascriptmvc.com/dist/javascriptmvc-3.3.zip'], textFilter:textFilters, log:'<yellow><bold>install:</bold></yellow>  curl StealJS', retry:3 });
         listInstall.push({ command:'unzip', options:[ path.join('assets', 'javascriptmvc.zip')], textFilter:textFilters, log:'<yellow><bold>install:</bold></yellow>  unzip StealJS', retry:3 });
-        listInstall.push({ command:'mv',    options:[ path.join('assets', 'javascriptmvc', 'steal'), path.join('assets', 'steal')], textFilter:textFilters, log:'<yellow><bold>install:</bold></yellow>  mv: StealJS', retry:3 });
-        listInstall.push({ command:'mv',    options:[ path.join('assets', 'javascriptmvc', 'js'), path.join('assets', 'cjs')], textFilter:textFilters, log:'<yellow><bold>install:</bold></yellow>  mv: StealJS:cjs', retry:3 });
-        listInstall.push({ command:'rm',    options:[ '-R', path.join('assets', 'javascriptmvc')], textFilter:textFilters, log:'<yellow><bold>install:</bold></yellow>  rm: javascriptmvc', retry:3 });
+        listInstall.push({ command:'mv',    options:[ path.join( 'javascriptmvc', 'steal'), path.join('assets', 'steal')], textFilter:textFilters, log:'<yellow><bold>install:</bold></yellow>  mv: StealJS', retry:3 });
+        listInstall.push({ command:'mv',    options:[ path.join( 'javascriptmvc', 'js'), path.join('assets', 'cjs')], textFilter:textFilters, log:'<yellow><bold>install:</bold></yellow>  mv: StealJS:cjs', retry:3 });
+        listInstall.push({ command:'rm',    options:[ '-R', path.join( 'javascriptmvc')], textFilter:textFilters, log:'<yellow><bold>install:</bold></yellow>  rm: javascriptmvc', retry:3 });
+        listInstall.push({ command:'rm',    options:[ '-R', path.join( 'assets', 'javascriptmvc.zip')], textFilter:textFilters, log:'<yellow><bold>install:</bold></yellow>  rm: javascriptmvc', retry:3 });
 
     }