Merge pull request #533 from kopiro/PR-29MAY17

Working i18n check instead of bad Alloy 1.8 check
dbankier · May 29, 2017 · babfdde · babfdde
2 parents c36c6c8 + 8de6bcc
commit babfdde
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cli/support/config.js b/cli/support/config.js
@@ -102,7 +102,6 @@ config.buildPaths = function(env, callback) {
     config.bundle_file       = path.join(config.tishadow_dist, config.bundle_name + ".zip");
     config.jshint_path       = fs.existsSync(config.alloy_path) ? config.alloy_path : config.resources_path;
     config.isAlloy = fs.existsSync(config.alloy_path);
-    config.isAlloy1_8_later = config.isAlloy && spawnSync("alloy",["-v"]).stdout >= "1.8.0";
     if (!config.platform && config.isAlloy) {
       var deploymentTargets = [];
       result['deployment-targets'][0].target.forEach(function(t) {

diff --git a/cli/tishadow b/cli/tishadow
@@ -226,7 +226,10 @@ function execute(filenames) {
 if (config.isWatching) {
   config.buildPaths({},function() {
     var paths = [config.isAlloy ? "app" :"Resources"];
-    if(!config.isAlloy1_8_later && fs.existsSync(path.join(config.base, 'i18n'))){
+    if (
+      fs.existsSync(path.join(config.base, 'i18n')) && 
+      !fs.existsSync(path.join(config.base, 'i18n', 'alloy_generated'))
+      ){
       paths.push('i18n');
     }
     if (config.isSpec) {