From: Doug Coleman <doug.coleman@gmail.com>
Date: Sat, 9 Dec 2017 07:42:55 +0000 (-0600)
Subject: build.cmd: Get boot images from the branch you're on.
X-Git-Tag: 0.98~605
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=2d8d374d7d44fe0130ac0a42ad113b032930a5ee

build.cmd: Get boot images from the branch you're on.
---

diff --git a/build.cmd b/build.cmd
index 590265b0d9..0ba6ede3cb 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,14 +1,19 @@
 @echo off
 setlocal
 
+: Fun syntax
+for /f %%x in ('git describe --all') do set GIT_DESCRIBE=%%x
+for /f %%y in ('git rev-parse HEAD') do set GIT_ID=%%y
+for /f %%z in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%z
+
 if "%1"=="/?" (
     goto usage
 ) else if "%1"=="" (
-    set _bootimage_version=latest
+    set _bootimage_version=%GIT_BRANCH%
 ) else if "%1"=="latest" (
-    set _bootimage_version=latest
+    set _bootimage_version=%GIT_BRANCH%
 ) else if "%1"=="update" (
-    set _bootimage_version=latest
+    set _bootimage_version=%GIT_BRANCH%
 ) else if "%1"=="clean" (
     set _bootimage_version=clean
 ) else goto usage
@@ -29,11 +34,6 @@ if not errorlevel 1 (
     ) else goto nocl
 )
 
-: Fun syntax
-for /f %%x in ('git describe --all') do set GIT_DESCRIBE=%%x
-for /f %%y in ('git rev-parse HEAD') do set GIT_ID=%%y
-for /f %%z in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%z
-
 set git_label=%GIT_DESCRIBE%-%GIT_ID%
 set version=0.98