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

Merge pull request #1 from FHIR/master

Browse Source 
Merge from script cleanup
This commit is contained in:
Jose Costa Teixeira 2019-12-19 08:12:57 +01:00 committed by GitHub
commit ac06f8cdec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 132 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
_genonce.bat
View File

@ -1,25 +1,27 @@
@echo off @ECHO OFF
SET publisher_jar=org.hl7.fhir.publisher.jar
SET input_cache_path=%CD%\input-cache\
ECHO Checking internet connection...
PING tx.fhir.org -n 1 -w 1000 | FINDSTR TTL && GOTO isonline
ECHO We're offline...
SET txoption=-tx n/a
GOTO igpublish
echo Checking internet connection...
Ping tx.fhir.org -n 1 -w 1000 | findstr TTL && goto isonline
echo We're offline...
set txoption=-tx n/a
goto igpublish
:isonline :isonline
echo We're online ECHO We're online
set txoption= SET txoption=
:igpublish :igpublish
SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
@SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 IF EXIST "%input_cache_path%\%publisher_jar%" (
JAVA -jar input-cache/org.hl7.fhir.publisher.jar -ig ig.ini %txoption%
) ELSE If exist "..\%publisher_jar%" (
JAVA -jar ../%publisher_jar% -ig ig.ini %txoption%
) ELSE (
ECHO IG Publisher NOT FOUND in input-cache or parent folder... aborting
)
If exist "input-cache\org.hl7.fhir.publisher.jar" ( PAUSE
JAVA -jar input-cache/org.hl7.fhir.publisher.jar -ig ig.ini %txoption%
) ELSE If exist "..\org.hl7.fhir.publisher.jar" (
JAVA -jar ../org.hl7.fhir.publisher.jar -ig ig.ini %txoption%
) Else (
@ECHO IG Publisher NOT FOUND in input-cache or parent folder... aborting
)
@PAUSE

26
_genonce.sh
View File

@ -1,27 +1,29 @@
#!/bin/bash #!/bin/bash
publisher_jar=org.hl7.fhir.publisher.jar
input_cache_path=./input-cache/
set -e set -e
echo Checking internet connection... echo Checking internet connection...
wget -q --spider tx.fhir.org wget -q --spider tx.fhir.org
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Online" echo "Online"
txoption="" txoption=""
else else
echo "Offline" echo "Offline"
txoption="-tx n/a" txoption="-tx n/a"
fi fi
echo "$txoption" echo "$txoption"
publisher=./input-cache/org.hl7.fhir.publisher.jar publisher=$input_cache_path/$publisher_jar
if test -f "$publisher"; then if test -f "$publisher"; then
JAVA -jar ./input-cache/org.hl7.fhir.publisher.jar -ig ig.ini $txoption JAVA -jar $publisher -ig ig.ini $txoption
else else
publisher=../org.hl7.fhir.publisher.jar publisher=../$publisher_jar
if test -f "$publisher"; then if test -f "$publisher"; then
JAVA -jar ../org.hl7.fhir.publisher.jar -ig ig.ini $txoption JAVA -jar $publisher -ig ig.ini $txoption
else else
echo IG Publisher NOT FOUND in input-cache or parent folder... aborting echo IG Publisher NOT FOUND in input-cache or parent folder... aborting
fi fi
fi fi

116
_updatePublisher.bat
View File

@ -1,69 +1,73 @@
@echo off @ECHO OFF
SET dlurl=https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.publisher.jar
SET publisher_jar=org.hl7.fhir.publisher.jar
SET input_cache_path=%CD%\input-cache\
for /f "tokens=4-5 delims=. " %%i in ('ver') do set VERSION=%%i.%%j FOR %%x IN ("%CD%") DO SET upper_path=%%~dpx
if "%version%" == "10.0" set winver=10
if "%version%" == "6.3" set winver=8.1
if "%version%" == "6.2" set winver=8
if "%version%" == "6.1" set winver=7
if "%version%" == "6.0" set winver=vista
for %%x in ("%CD%") do set upper_path=%%~dpx
set current_path=%cd%
@Set location=
rem echo inputcachepath
rem echo "%current_path%\input-cache\org.hl7.fhir.publisher.jar"
If not exist "%current_path%\input-cache\org.hl7.fhir.publisher.jar" (
If not exist "%upper_path%org.hl7.fhir.publisher.jar" (
@ECHO IG Publisher is not in input-cache or parent folder...
@Set filelocation="%current_path%\input-cache\org.hl7.fhir.publisher.jar"
echo %filelocation%
@goto:download
) else (
@ECHO IG Publisher FOUND in parent folder
@Set location=parent
@Set filelocation="%upper_path%org.hl7.fhir.publisher.jar"
@set filelocationname=Parent folder
echo %filelocation%
@goto:upgrade
IF NOT EXIST "%input_cache_path%%publisher_jar%" (
IF NOT EXIST "%upper_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 jarlocationname=Parent folder
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 location=cache SET jarlocationname=Input Cache
@Set filelocation="%current_path%\input-cache\org.hl7.fhir.publisher.jar" GOTO:upgrade
@set filelocationname=Input Cache
echo %filelocation%
@goto:upgrade
) )
echo Done :create
goto:eof ECHO Will place publisher jar here: %input_cache_path%%publisher_jar%
SET /p create="Ok? (Y/N)"
IF /I "%create%"=="Y" (
MKDIR "%input_cache_path%" 2> NUL
GOTO:download
)
GOTO:done
:upgrade :upgrade
set /p overwrite="Overwrite? " SET /p overwrite="Overwrite %jarlocation%? (Y/N)"
if /I "%overwrite%"=="Y" ( IF /I "%overwrite%"=="Y" (
goto:download GOTO:download
) )
GOTO:done
goto:eof
:download :download
set dlurl=https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.publisher.jar ECHO Downloading most recent publisher to %jarlocationname% - it's ~100 MB, so this may take a bit
@ECHO Downloading most recent publisher to %filelocationname% - it's ~100 MB, so this may take a bit
if /I "%winver%"=="10" ( FOR /f "tokens=4-5 delims=. " %%i IN ('ver') DO SET VERSION=%%i.%%j
@POWERSHELL -command Invoke-WebRequest -Uri %dlurl% -Outfile %filelocation% IF "%version%" == "10.0" GOTO win10
) IF "%version%" == "6.3" GOTO win8.1
IF "%version%" == "6.2" GOTO win8
IF "%version%" == "6.1" GOTO win7
IF "%version%" == "6.0" GOTO vista
if /I "%winver%"=="7" ( ECHO Unrecognized version: %version%
bitsadmin /transfer GetPublisher /download /priority normal %dlurl% %filelocation% GOTO done
)
@ECHO "Done" :win10
pause POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%dlurl%\",\"%jarlocation%\") } else { Invoke-WebRequest -Uri "%dlurl%" -Outfile "%jarlocation%" }
:eof
GOTO done
:win7
bitsadmin /transfer GetPublisher /download /priority normal "%dlurl%" "%jarlocation%"
GOTO done
:win8.1
:win8
:vista
ECHO This script does not yet support Windows %winver%. Please ask for help on http://chat.fhir.org
GOTO done
:done
PAUSE

63
_updatePublisher.sh
View File

@ -1,35 +1,48 @@
#!/bin/bash #!/bin/bash
dlurl=https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.publisher.jar
publisher_jar=org.hl7.fhir.publisher.jar
input_cache_path=./input-cache/
set -e set -e
if ! type "curl" > /dev/null; then if ! type "curl" > /dev/null; then
echo "ERROR: Script needs curl to download latest IG Publisher. Please install curl." echo "ERROR: Script needs curl to download latest IG Publisher. Please install curl."
exit 1 exit 1
fi
publisher=./input-cache/org.hl7.fhir.publisher.jar publisher="$input_cache_dir$publisher_jar"
if test -f "$publisher"; then if test -f "$publisher"; then
jarlocation="./input-cache/org.hl7.fhir.publisher.jar" echo "IG Publisher FOUND in input-cache"
echo "IG Publisher FOUND in input-cache" jarlocation="$publisher"
jarlocationname=Input Cache
upgrade=true
else else
publisher=../org.hl7.fhir.publisher.jar publisher="../$publisher_jar"
upgrade=true upgrade=true
if test -f "$publisher"; then if test -f "$publisher"; then
echo "IG Publisher FOUND in parent folder" echo "IG Publisher FOUND in parent folder"
jarlocation="../org.hl7.fhir.publisher.jar" jarlocation="$publisher"
upgrade=true jarlocationname=Input Cache
else upgrade=true
echo IG Publisher NOT FOUND in input-cache or parent folder... else
jarlocation="./input-cache/org.hl7.fhir.publisher.jar" echo IG Publisher NOT FOUND in input-cache or parent folder...
upgrade=true jarlocation="$input_cache_dir$publisher_jar"
fi jarlocationname=Input Cache
upgrade=false
fi
fi fi
if $upgrade ; then if $upgrade ; then
read -r -p "Download? [y/N] " response message = "Overwrite $jarlocation? [Y/N] "
if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]] else
then echo Will place publisher jar here: $input_cache_path$publisher_jar
echo "Downloading most recent publisher to $jarlocation - it's ~100 MB, so this may take a bit" message = "Ok? [Y/N] "
# wget "https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.publisher.jar" -O "$jarlocation" fi
curl https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.publisher.jar -o "$jarlocation" --create-dirs
else read -r -p $message response
echo cancel... if [[ "$response" =~ ^([yY])$ ]] then
fi 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
else
echo cancel...
fi fi