Update PWA Sub Directory based on Publishing Properties

Author: chrisvire

application/console/views/cron/scripts/upload/default/build.sh

@@ -571,21 +571,21 @@ prepare_appbuilder_project() {
         fi
       fi
 
-      # If modern-pwa, then use the subdirectory configuration for the rclone publish path if not defined
+      # If modern-pwa, then update the subdirectory configuration from the rclone publish path if not defined
       for target in $TARGETS; do
         if [ "$target" = "modern-pwa" ]; then
-          PUBLISH_TMP=$(mktemp)
+          APPDEF_TMP=$(mktemp)
           INPUT_PUBLISH_PROPERTIES=$PUBLISH_PROPERTIES
           if [ -f "${OUTPUT_PUBLISH_PROPERTIES}" ]; then
             INPUT_PUBLISH_PROPERTIES=$OUTPUT_PUBLISH_PROPERTIES
           fi
           if jq -e '.PUBLISH_CLOUD_REMOTE_PATH' "${INPUT_PUBLISH_PROPERTIES}" >/dev/null; then
-            echo "PUBLISH_CLOUD_REMOTE_PATH exists."
-          else
-            echo "PUBLISH_CLOUD_REMOTE_PATH set to PWA SUBDIR."
-            PWA_SUBDIR=$(xmllint --xpath "/app-definition/pwa-manifest/pwa-sub-directory/text()" build.appDef)
-            jq -cM ".PUBLISH_CLOUD_REMOTE_PATH += \"${PWA_SUBDIR}\"" "${INPUT_PUBLISH_PROPERTIES}" > "${PUBLISH_TMP}"
-            cp "${PUBLISH_TMP}" "${OUTPUT_PUBLISH_PROPERTIES}"
+            echo "PUBLISH_CLOUD_REMOTE_PATH exists. Check PWA SUBDIR."
+            if ! xmlstarlet sel -t -v "/app-definition/pwa-manifest/pwa-sub-directory" build.appDef 2>/dev/null; then
+                echo "set missing PWA SUBDIR to PUBLISH_CLOUD_REMOTE_PATH."
+                xmlstarlet ed -s "/app-definition/pwa-manifest" -t elem -n "pwa-sub-directory" -v "/${PUBLISH_CLOUD_REMOTE_PATH}" build.appDef > "${APPDEF_TMP}"
+                cp "${APPDEF_TMP}" build.appDef
+            fi
           fi
         fi
       done

application/console/views/cron/scripts/upload/default/publish.sh

@@ -295,6 +295,7 @@ publish_rclone() {
   fi
 
   ${RCLONE} mkdir "${PUBLISH_CLOUD_REMOTE}:${PUBLISH_CLOUD_REMOTE_ROOT}${PUBLISH_CLOUD_REMOTE_PATH}"
+  # shellcheck disable=SC2086
   ${RCLONE} ${PUBLISH_CLOUD_COMMAND} -u "${PUBLISH_CLOUD_SOURCE_PATH}" "${PUBLISH_CLOUD_REMOTE}:${PUBLISH_CLOUD_REMOTE_ROOT}${PUBLISH_CLOUD_REMOTE_PATH}"
 
   PUBLISH_BASE_URL=$(${RCLONE} config dump | jq -r ".[\"${PUBLISH_CLOUD_REMOTE}\"].public_url")