From bc07606c522834d39ce35f545b325e2538f64718 Mon Sep 17 00:00:00 2001 From: Christian Van Wambeke Date: Thu, 2 Aug 2018 14:58:30 +0200 Subject: [PATCH] fix automatic switch '.sh' to '.bat' for script windows file --- src/product.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/product.py b/src/product.py index 23774e5..948ebcc 100644 --- a/src/product.py +++ b/src/product.py @@ -227,11 +227,18 @@ Please provide a 'compil_script' key in its definition.""") % product_name config.PATHS.PRODUCTPATH, "compil_scripts") if not script_path: - raise src.SatException( - _("Compilation script not found: %s") % script_name) + raise src.SatException(_("Compilation script not found: %s") % script_name) prod_info.compil_script = script_path if src.architecture.is_windows(): - prod_info.compil_script = prod_info.compil_script[:-len(".sh")] + ".bat" + if ".sh" in script_path: + DBG.write("automatic switch '.sh' to '.bat' for script windows file %s" % script_path, True) + prod_info.compil_script = prod_info.compil_script[:-len(".sh")] + ".bat" + else: + if ".bat" not in script_path: + DBG.write("No expected extension ('.sh' or '.bat') file name for script windows file %s" % script_path, True) + else: + pass # mode olivier .bat present yet nothing to do + # Check that the script is executable if not os.access(prod_info.compil_script, os.X_OK): -- 2.39.2