Merge pull request #5719 from cb1kenobi/timob-17008_3_3_X

[TIMOB-17008] Fixed project command to reference the new template path.
tidev · May 21, 2014 · 58140ca · 58140ca
2 parents f067331 + 8f7921a
commit 58140ca
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cli/commands/project.js b/cli/commands/project.js
@@ -211,8 +211,8 @@ exports.run = function (logger, config, cli, finished) {
 					// Update the tiapp.xml
 					tiapp['deployment-targets'] = result;
 
-					// Non-destructively copy over files from <sdk>/templates/app/<template>/
-					templateDir = path.join(sdkPath, 'templates', 'app', cli.argv.template);
+					// Non-destructively copy over files from <sdk>/templates/app/<template>/template
+					templateDir = path.join(sdkPath, 'templates', 'app', cli.argv.template, 'template');
 					if (!appc.fs.exists(templateDir)) {
 						logger.error(__('Unknown project template %s', cli.argv.template) + '\n');
 						process.exit(1);
@@ -226,7 +226,7 @@ exports.run = function (logger, config, cli, finished) {
 					// Non-destructively copy over files from <sdk>/<each platform>/templates/app/<template>/
 					for (p = 0; p < value.length; p++) {
 						if (value[p]) {
-							templateDir = path.join(sdkPath, ti.resolvePlatform(value[p]), 'templates', 'app', cli.argv.template);
+							templateDir = path.join(sdkPath, ti.resolvePlatform(value[p]), 'templates', 'app', cli.argv.template, 'template');
 							if (appc.fs.exists(templateDir)) {
 								n += appc.fs.nonDestructiveCopyDirSyncRecursive(templateDir, projectDir, {
 									logger: logger.log,