Merge pull request #721 from HL7/gg-202307-fix-rel-path

Gg 202307 fix rel path
HL7 · Jul 6, 2023 · 8ff2ad9 · 8ff2ad9
2 parents e0f1fd7 + e4bc8e1
commit 8ff2ad9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java
@@ -11365,7 +11365,7 @@ public static void main(String[] args) throws Exception {
       System.out.println("the publisher also supports the param -proxy=[address]:[port] for if you use a proxy (stupid java won't pick up the system settings)");
       System.out.println("or you can configure the proxy using -Dhttp.proxyHost=<ip> -Dhttp.proxyPort=<port> -Dhttps.proxyHost=<ip> -Dhttps.proxyPort=<port>");
       System.out.println("");
-      System.out.println("For additional information, see http://wiki.hl7.org/index.php?title=Proposed_new_FHIR_IG_build_Process");
+      System.out.println("For additional information, see https://confluence.hl7.org/display/FHIR/IG+Publisher+Documentation");
     } else if (hasNamedParam(args, "-convert")) {
       // convert a igpack.zip to a package.tgz
       IGPack2NpmConvertor conv = new IGPack2NpmConvertor();

diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/PublicationProcess.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/web/PublicationProcess.java
@@ -295,7 +295,7 @@ public List<ValidationMessage> publishInner2(String source, String web, String d
 
     PublicationProcessMode mode = PublicationProcessMode.fromCode(prSrc.asString("mode"));
     boolean first = prSrc.asBoolean("first"); 
-    src.needOptionalFile(relDest == null ? "package-list.json" : Utilities.path(relDest,"package-list.json"));
+    src.needOptionalFile(Utilities.noString(relDest) ? "package-list.json" : Utilities.path(relDest,"package-list.json"));
     if (first) {
       if (new File(Utilities.path(destination, "package-list.json")).exists()) {
         check(res, false, "Package List already exists, but the publication request says this is the first publication");