Merge branch 'master' into patch-1

_gencontinuous.bat

@@ -1,2 +1,2 @@
 @ECHO OFF
-CALL _genonce.bat -watch
+CALL ./_genonce.bat -watch

_gencontinuous.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-_genonce.sh -watch
+./_genonce.sh -watch

_genonce.sh

@@ -3,7 +3,7 @@ publisher_jar=org.hl7.fhir.publisher.jar
 input_cache_path=./input-cache/
 set -e
 echo Checking internet connection...
-wget -q --spider tx.fhir.org
+curl -sSf tx.fhir.org > /dev/null
 
 if [ $? -eq 0 ]; then
 	echo "Online"

_updatePublisher.bat

@@ -27,7 +27,7 @@ IF NOT EXIST "%input_cache_path%%publisher_jar%" (
 
 :create
 ECHO Will place publisher jar here: %input_cache_path%%publisher_jar%
-SET /p create="Ok? (Y/N)"
+SET /p create="Ok? (Y/N) "
 IF /I "%create%"=="Y" (
 	MKDIR "%input_cache_path%" 2> NUL
 	GOTO:download
@@ -35,7 +35,7 @@ IF /I "%create%"=="Y" (
 GOTO:done
 
 :upgrade
-SET /p overwrite="Overwrite %jarlocation%? (Y/N)"
+SET /p overwrite="Overwrite %jarlocation%? (Y/N) "
 IF /I "%overwrite%"=="Y" (
 	GOTO:download
 )

_updatePublisher.sh

@@ -9,6 +9,20 @@ if ! type "curl" > /dev/null; then
 	exit 1
 fi
 
+FORCE=false
+
+while :; do
+    case $1 in
+        -f|--force) FORCE=true ;;
+        --)
+            shift
+            break
+            ;;
+        *) break
+    esac
+    shift
+done
+
 publisher="$input_cache_path$publisher_jar"
 if test -f "$publisher"; then
 	echo "IG Publisher FOUND in input-cache"
@@ -31,15 +45,17 @@ else
 	fi
 fi
 
-if "$upgrade"; then
+if [[ "$FORCE" != true ]]; then
-	message="Overwrite $jarlocation?"
+  if "$upgrade"; then
-else
+    message="Overwrite $jarlocation? (Y/N) "
-	echo Will place publisher jar here: "$jarlocation"
+  else
-	message="Ok (enter 'y' or 'Y' to continue, any other key to cancel) ?"
+    echo Will place publisher jar here: "$jarlocation"
+    message="Ok (enter 'y' or 'Y' to continue, any other key to cancel)?"
+  fi
+  read -r -p "$message" response
 fi
 
-read -r -p "$message" response
+if [[ "$FORCE" ]] || [[ "$response" =~ ^([yY])$ ]]; then
-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