gitadmin/BD-Core-FHIR-IG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update batch to work with filepaths with spaces

Browse Source
This commit is contained in:
José Costa Teixeira 2020-01-17 10:12:04 +01:00
parent d45095f26a
commit cfb1bf063b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_genonce.bat
View File

@ -1,6 +1,6 @@
@ECHO OFF @ECHO OFF
SET publisher_jar=org.hl7.fhir.publisher.jar SET publisher_jar=org.hl7.fhir.publisher.jar
SET input_cache_path=%CD%\input-cache\ SET input_cache_path=%CD%\input-cache
ECHO Checking internet connection... ECHO Checking internet connection...
PING tx.fhir.org -n 1 -w 1000 | FINDSTR TTL && GOTO isonline PING tx.fhir.org -n 1 -w 1000 | FINDSTR TTL && GOTO isonline
@ -17,9 +17,9 @@ SET txoption=
SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
IF EXIST "%input_cache_path%\%publisher_jar%" ( IF EXIST "%input_cache_path%\%publisher_jar%" (
JAVA -jar %input_cache_path%\%publisher_jar% -ig ig.ini %txoption% %* JAVA -jar "%input_cache_path%\%publisher_jar%" -ig ig.ini %txoption% %*
) ELSE If exist "..\%publisher_jar%" ( ) ELSE If exist "..\%publisher_jar%" (
JAVA -jar ..\%publisher_jar% -ig ig.ini %txoption% %* JAVA -jar "..\%publisher_jar%" -ig ig.ini %txoption% %*
) ELSE ( ) ELSE (
ECHO IG Publisher NOT FOUND in input-cache or parent folder. Please run _updatePublisher. Aborting... ECHO IG Publisher NOT FOUND in input-cache or parent folder. Please run _updatePublisher. Aborting...
) )

6
_updatePublisher.bat
View File

@ -7,20 +7,20 @@ FOR %%x IN ("%CD%") DO SET upper_path=%%~dpx
IF NOT EXIST "%input_cache_path%%publisher_jar%" ( IF NOT EXIST "%input_cache_path%%publisher_jar%" (
IF NOT EXIST "%upper_path%%publisher_jar%" ( IF NOT EXIST "%upper_path%%publisher_jar%" (
SET jarlocation=%input_cache_path%%publisher_jar% SET jarlocation="%input_cache_path%%publisher_jar%"
SET jarlocationname=Input Cache SET jarlocationname=Input Cache
ECHO IG Publisher is not yet in input-cache or parent folder. ECHO IG Publisher is not yet in input-cache or parent folder.
REM we don't use jarlocation below because it will be empty because we're in a bracketed if statement REM we don't use jarlocation below because it will be empty because we're in a bracketed if statement
GOTO create GOTO create
) ELSE ( ) ELSE (
ECHO IG Publisher FOUND in parent folder ECHO IG Publisher FOUND in parent folder
SET jarlocation=%upper_path%%publisher_jar% SET jarlocation="%upper_path%%publisher_jar%"
SET jarlocationname=Parent folder SET jarlocationname=Parent folder
GOTO:upgrade GOTO:upgrade
) )
) ELSE ( ) ELSE (
ECHO IG Publisher FOUND in input-cache ECHO IG Publisher FOUND in input-cache
SET jarlocation=%input_cache_path%%publisher_jar% SET jarlocation="%input_cache_path%%publisher_jar%"
SET jarlocationname=Input Cache SET jarlocationname=Input Cache
GOTO:upgrade GOTO:upgrade
) )