updated

updated updated updated
jembi · Jul 16, 2024 · 2acff82 · 2acff82
1 parent e08be26
commit 2acff82
Show file tree

Hide file tree

Showing 8 changed files with 549 additions and 367 deletions.
diff --git a/_genonce.sh b/_genonce.sh
@@ -14,6 +14,8 @@ fi
 
 echo "$txoption"
 
+export JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -Dfile.encoding=UTF-8"
+
 publisher=$input_cache_path/$publisher_jar
 if test -f "$publisher"; then
 	java -jar $publisher -ig . $txoption $*

diff --git a/_updatePublisher.bat b/_updatePublisher.bat
@@ -216,4 +216,4 @@ start copy /y "_updatePublisher.new.bat" "_updatePublisher.bat" ^&^& del "_updat
 
 IF "%skipPrompts%"=="true" (
   PAUSE
-}
+)
diff --git a/_updatePublisher.sh b/_updatePublisher.sh
@@ -31,11 +31,7 @@ while [ "$#" -gt 0 ]; do
 done
 
 echo "Checking internet connection"
-case "$OSTYPE" in
-	linux-gnu* ) ping tx.fhir.org -4 -c 1 -w 1000 >/dev/null ;;
-  darwin* )	ping tx.fhir.org -c 1 >/dev/null ;;
-	*) echo "unknown: $OSTYPE"; exit 1 ;;
-esac
+curl -sSf tx.fhir.org > /dev/null
 
 if [ $? -ne 0 ] ; then
   echo "Offline (or the terminology server is down), unable to update.  Exiting"
@@ -121,13 +117,16 @@ if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then
 
   curl -L $gencont_sh_url -o /tmp/_gencontinuous.new
   cp /tmp/_gencontinuous.new _gencontinuous.sh
+  chmod +x _gencontinuous.sh
   rm /tmp/_gencontinuous.new
 
   curl -L $gen_sh_url -o /tmp/_genonce.new
   cp /tmp/_genonce.new _genonce.sh
+  chmod +x _genonce.sh
   rm  /tmp/_genonce.new
 
   curl -L $update_sh_url -o /tmp/_updatePublisher.new
   cp /tmp/_updatePublisher.new _updatePublisher.sh
+  chmod +x _updatePublisher.sh
   rm /tmp/_updatePublisher.new
 fi
diff --git a/input/fsh/alias.fsh b/input/fsh/alias.fsh
@@ -29,6 +29,7 @@ Alias: $TPTFollowUpFollowUpCodeSystem = http://moh.gov.et/fhir/hiv/CodeSystem/tp
 Alias: $TPTProphylaxisTypeCodeSystem = http://moh.gov.et/fhir/hiv/CodeSystem/tpt-prophylaxis-type-code-system
 Alias: $TPTAlternateProphylaxisTypeCodeSystem = http://moh.gov.et/fhir/hiv/CodeSystem/tpt-alternate-prophylaxis-type-code-system
 Alias: $TPT3HPFollowUpCodeSystem = http://moh.gov.et/fhir/hiv/CodeSystem/tpt-3hp-follow-up-code-system
+Alias: $TPT3HRFollowUpCodeSystem = http://moh.gov.et/fhir/hiv/CodeSystem/tpt-3hr-follow-up-code-system
 Alias: $ARVTreatmentCodeSystem = http://moh.gov.et/fhir/hiv/CodeSystem/arv-treatment-code-system
 Alias: $ReasonForARTEligibilityCodeSystem = http://moh.gov.et/fhir/hiv/CodeSystem/reason-for-art-eligibility-code-system
 Alias: $ARTEligibilityStatusCodeSystem = http://moh.gov.et/fhir/hiv/CodeSystem/art-eligibility-status-code-system
@@ -56,4 +57,6 @@ Alias: $ReferralReason = http://moh.gov.et/fhir/hiv/CodeSystem/referral-reason-c
 Alias: $EpisodeOfCareID = http://moh.gov.et/fhir/hiv/identifier/episode-of-care
 Alias: $EACGiven = http://moh.gov.et/fhir/hiv/CodeSystem/eac-given-code-system
 Alias: $TBScreeningDiagnosticTest = http://moh.gov.et/fhir/hiv/CodeSystem/tb-screening-diagnostic-test-type-code-system
-Alias: $ReferenceRangeMeaning = http://terminology.hl7.org/CodeSystem/referencerange-meaning
+Alias: $ReferenceRangeMeaning = http://terminology.hl7.org/CodeSystem/referencerange-meaning
+Alias: $INHAtFollowUp = http://moh.gov.et/fhir/hiv/CodeSystem/inh-follow-up-code-system
+Alias: $TPTAlternateProphylaxisType = http://moh.gov.et/fhir/hiv/CodeSystem/tpt-alternate-prophylaxis-type-code-system
-Original file line number
+Diff line change
@@ Expand Up @@
     IF "%skipPrompts%"=="true" (
       PAUSE
-    }
+    )