fix removing trailing semicolon logic in bat (#279)

colcon · Dec 10, 2019 · e1a1029 · e1a1029
1 parent 8a06f55
commit e1a1029
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/colcon_core/shell/bat.py b/colcon_core/shell/bat.py
@@ -26,8 +26,9 @@ class BatShell(ShellExtensionPoint):
     FORMAT_STR_USE_ENV_VAR = '%{name}%'
     FORMAT_STR_INVOKE_SCRIPT = 'call:_colcon_prefix_bat_call_script ' \
         '"{script_path}"'
-    FORMAT_STR_REMOVE_TRAILING_SEPARATOR = 'if "%{name}:~-1%==";" ' \
-        'set {name}=%{name}:~0,-1%'
+    # can't use `if` here since each line is being `call`-ed
+    FORMAT_STR_REMOVE_TRAILING_SEPARATOR = \
+        'call:_colcon_prefix_bat_strip_trailing_semicolon "{name}"'
 
     def __init__(self):  # noqa: D107
         super().__init__()

diff --git a/colcon_core/shell/template/prefix.bat.em b/colcon_core/shell/template/prefix.bat.em
@@ -101,3 +101,17 @@ goto:eof
     echo not found: "%~1" 1>&2
   )
 goto:eof
+
+
+:: strip a trailing semicolon from an environment variable if applicable
+:: first argument: the environment variable name
+:_colcon_prefix_bat_strip_trailing_semicolon
+  setlocal enabledelayedexpansion
+  set "name=%~1"
+  set "value=!%name%!"
+  if "%value:~-1%"==";" set "value=%value:~0,-1%"
+  :: set result variable in parent scope
+  endlocal & (
+    set "%~1=%value%"
+  )
+goto:eof