From 8de6bccbce4cda317c6d94a0cc0aa92fe25d93e5 Mon Sep 17 00:00:00 2001 From: Flavio De Stefano Date: Mon, 29 May 2017 15:56:35 +0200 Subject: [PATCH] Working i18n check instead of bad Alloy 1.8 check --- cli/support/config.js | 1 - cli/tishadow | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cli/support/config.js b/cli/support/config.js index 84da64d4..6d6e0743 100644 --- 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 index 2f97620d..8980e7e8 100755 --- 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) {