diff --git a/_genonce.bat b/_genonce.bat index e21ba02..2c32e92 100644 --- a/_genonce.bat +++ b/_genonce.bat @@ -1,6 +1,6 @@ @ECHO OFF 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... 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 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%" ( - JAVA -jar ..\%publisher_jar% -ig ig.ini %txoption% %* + JAVA -jar "..\%publisher_jar%" -ig ig.ini %txoption% %* ) ELSE ( ECHO IG Publisher NOT FOUND in input-cache or parent folder. Please run _updatePublisher. Aborting... ) diff --git a/_updatePublisher.bat b/_updatePublisher.bat index 3176eac..0e8653d 100644 --- a/_updatePublisher.bat +++ b/_updatePublisher.bat @@ -7,20 +7,20 @@ FOR %%x IN ("%CD%") DO SET upper_path=%%~dpx IF NOT EXIST "%input_cache_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 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 GOTO create ) ELSE ( ECHO IG Publisher FOUND in parent folder - SET jarlocation=%upper_path%%publisher_jar% + SET jarlocation="%upper_path%%publisher_jar%" SET jarlocationname=Parent folder GOTO:upgrade ) ) ELSE ( 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 GOTO:upgrade ) diff --git a/_updatePublisher.sh b/_updatePublisher.sh index be33d0f..7307202 100755 --- a/_updatePublisher.sh +++ b/_updatePublisher.sh @@ -9,7 +9,7 @@ if ! type "curl" > /dev/null; then exit 1 fi -publisher="$input_cache_dir$publisher_jar" +publisher="$input_cache_path$publisher_jar" if test -f "$publisher"; then echo "IG Publisher FOUND in input-cache" jarlocation="$publisher" @@ -25,21 +25,21 @@ else upgrade=true else echo IG Publisher NOT FOUND in input-cache or parent folder... - jarlocation="$input_cache_dir$publisher_jar" + jarlocation=$input_cache_path$publisher_jar jarlocationname="Input Cache" upgrade=false fi fi -if $upgrade ; then - message="Overwrite $jarlocation? [Y/N] " +if "$upgrade"; then + message="Overwrite $jarlocation?" else - echo Will place publisher jar here: $input_cache_path$publisher_jar - message="Ok? [Y/N] " + echo Will place publisher jar here: "$jarlocation" + message="Ok?" fi -read -r -p $message response -if [[ "$response" =~ ^([yY])$ ]] then +read -r -p "$message" response +if [[ "$response" =~ ^([yY])$ ]]; then echo "Downloading most recent publisher to $jarlocationname - it's ~100 MB, so this may take a bit" # wget "https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.publisher.jar" -O "$jarlocation" curl $dlurl -o "$jarlocation" --create-dirs diff --git a/input/pagecontent/StructureDefinition-ext-myExtension-intro.md b/input/pagecontent/StructureDefinition-ext-myExtension-intro.md index a1a8467..2352fa4 100644 --- a/input/pagecontent/StructureDefinition-ext-myExtension-intro.md +++ b/input/pagecontent/StructureDefinition-ext-myExtension-intro.md @@ -1,2 +1,2 @@ -###Introduction -Introductory guidance on myExtension \ No newline at end of file +### Introduction +Introductory guidance on myExtension