From bd52990cc5fb0bb4adef40d5270a8609512d4338 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Thu, 19 Nov 2020 19:29:08 +0100 Subject: [PATCH 1/2] Fix logic in _updatePublisher.bat --- _updatePublisher.bat | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/_updatePublisher.bat b/_updatePublisher.bat index a8bf6ee..d497c96 100644 --- a/_updatePublisher.bat +++ b/_updatePublisher.bat @@ -14,7 +14,7 @@ set gencont_sh_url=https://raw.githubusercontent.com/FHIR/sample-ig/master/_genc set gen_sh_url=https://raw.githubusercontent.com/FHIR/sample-ig/master/_genonce.sh set update_sh_url=https://raw.githubusercontent.com/FHIR/sample-ig/master/_updatePublisher.sh -IF "%~1"=="/f" SET skipPrompts=true +IF "%~1"=="/f" SET skipPrompts=y ECHO. @@ -65,21 +65,21 @@ IF DEFINED FORCE ( GOTO download ) -IF "%skipPrompts%"=="true" ( - SET create="Y" +IF "%skipPrompts%"=="y" ( + SET create=Y ) ELSE ( SET /p create="Ok? (Y/N) " ) IF /I "%create%"=="Y" ( - ECHO Will place publisher jar here: %input_cache_path%%publisher_jar% + ECHO Will place publisher jar here: %input_cache_path%%publisher_jar% MKDIR "%input_cache_path%" 2> NUL GOTO download ) GOTO done :upgrade -IF "%skipPrompts%"=="true" ( - SET overwrite="Y" +IF "%skipPrompts%"=="y" ( + SET overwrite=Y ) ELSE ( SET /p overwrite="Overwrite %jarlocation%? (Y/N) " ) @@ -132,8 +132,8 @@ GOTO done ECHO. ECHO Updating scripts -IF "%skipPrompts%"=="true" ( - SET updateScripts="Y" +IF "%skipPrompts%"=="y" ( + SET updateScripts=Y ) ELSE ( SET /p updateScripts="Update scripts? (Y/N) " ) @@ -215,4 +215,4 @@ start copy /y "_updatePublisher.new.bat" "_updatePublisher.bat" ^&^& del "_updat IF "%skipPrompts%"=="true" ( PAUSE -} +} \ No newline at end of file From 0b53a66530037cc7bac8daa441ebb74101a48f78 Mon Sep 17 00:00:00 2001 From: Jose Costa Teixeira Date: Wed, 2 Dec 2020 11:06:40 +0100 Subject: [PATCH 2/2] add new publisher jar filename to .gitignore (not yet .gitignoring the entire input-cache folder) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 03b06aa..2fa6922 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ output # Don't commit this because it's so large # ########################################### /input-cache/org.hl7.fhir.publisher.jar +/input-cache/publisher.jar # Windows generated files # ###########################