Remove leading 'v' from git describe

saltstack · May 22, 2020 · 30a37e4 · 30a37e4
1 parent f1dfe64
commit 30a37e4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/windows/build.bat b/pkg/windows/build.bat
@@ -15,7 +15,7 @@
 
 :: This script accepts two parameters.
 ::   Version: The version of Salt being built. If not passed, the version will
-::            determined using `git describe`
+::            determined using `git describe`. The leading `v` will be removed
 ::   Python: The version of Python to build Salt on (Default is 3)
 
 :: These parameters can be passed positionally or as named parameters. Named
@@ -94,9 +94,14 @@ if not "%~2"=="" (
 )
 
 :: If Version not defined, Get the version from Git
+set git=0
 if "%Version%"=="" (
+    echo Getting version from git
     for /f "delims=" %%a in ('git describe') do @set "Version=%%a"
+    set git=1
 )
+:: Strip off the leading `v` when getting version from git describe
+if %git%==1 set Version=%Version:~1%
 
 :: If Python not defined, Assume Python 3
 if "%Python%"=="" (