Merge ~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:usn-util-fix into ubuntu-security-tools:master

[Spyros Seimenis]

[Spyros Seimenis (sespiros)]

usn_create_usn_template function is a bash helper for step 3 of https://wiki.ubuntu.com/SecurityTeam/UpdatePublication#Announce_Publication.

It already covered the most common cases for a USN publication but didn't properly cover some cases for ESM.

a93df7f... by Spyros Seimenis on 2022-02-07

Fix command execution for bash and zsh

Unmerged commits

a93df7f... by Spyros Seimenis on 2022-02-07

Fix command execution for bash and zsh

52e9d64... by Spyros Seimenis on 2022-01-11

usn-tools: Fix ESM cases for usn_create_usn_template command

  - support for merge usn only for proposed and esm for now
  - upload to private repo needs explicit argument "private"
  - formatting

diff --git a/usn-tools/dot.usn-functions.sh b/usn-tools/dot.usn-functions.sh
index ffb7392..cc2c27e 100644
--- a/usn-tools/dot.usn-functions.sh
+++ b/usn-tools/dot.usn-functions.sh
@@ -53,15 +53,41 @@ usn_create_usn_template() {
     local PENDING_DIR="${_TMPDIR}/pending-${SRCPKG// /-}-usn-${USN}"
     local USN_SCRIPT="${USN_SCRIPT_DIR}/new-${SRCPKG// /-}-usn-${USN}.sh"
 
+    sis_changes_cmd="$UCT/scripts/sis-changes --download ${PENDING_DIR} $SRCPKG"
+    sis_generate_usn_cmd="cd ${PENDING_DIR} && $UCT/scripts/sis-generate-usn --no-new-warn $USN ./*.changes > ${USN_SCRIPT}"
     if [ -z "$1" ]; then
-        "$UCT/scripts/sis-changes" --download "${PENDING_DIR}" $SRCPKG && cd "${PENDING_DIR}" && "$UCT/scripts/sis-generate-usn" --no-new-warn "$USN" ./*.changes > "${USN_SCRIPT}"
+        echo "Usage: sis-changes [private/proposed/esm-infra/esm-apps/merge]"
+        return 1
+    elif [ "$1" = "private" ]; then
+        sis_changes_cmd="$sis_changes_cmd && $sis_generate_usn_cmd"
     elif [ "$1" = "proposed" ]; then
-        "$UCT/scripts/sis-changes" --download "${PENDING_DIR}" $SRCPKG --ppa ubuntu-security-proposed/ppa && cd "${PENDING_DIR}" && "$UCT/scripts/sis-generate-usn" --no-new-warn "$USN" ./*.changes > "${USN_SCRIPT}"
-    elif [ "$1" = "esm" ]; then
-        "$UCT/scripts/sis-changes" --download "${PENDING_DIR}" $SRCPKG --ppa ubuntu-security/esm --include-eol && cd "${PENDING_DIR}" && "$UCT/scripts/sis-generate-usn" --no-new-warn "$USN" ./*.changes > "${USN_SCRIPT}"
+        sis_changes_cmd="$sis_changes_cmd --ppa ubuntu-security-proposed/ppa && $sis_generate_usn_cmd"
+    elif [ "$1" = "esm-infra" ]; then
+        sis_changes_cmd="$sis_changes_cmd --ppa ubuntu-esm/esm-infra-security-staging --include-eol && $sis_generate_usn_cmd"
+    elif [ "$1" = "esm-apps" ]; then
+        sis_changes_cmd="$sis_changes_cmd --ppa ubuntu-esm/esm-apps-security-staging --include-eol && $sis_generate_usn_cmd"
+    elif [ "$1" = "merge" ]; then
+        sis_changes_cmd="$sis_changes_cmd --ppa ubuntu-security-proposed/ppa"
+        if [ -z "$2" ]; then
+            echo "Usage: sis-changes merge [esm-apps/esm-infra]"
+            return 1
+        elif [ "$2" = "esm-infra" ]; then
+            sis_changes_cmd="$sis_changes_cmd --esm-merge-ppa ubuntu-esm/esm-infra-security-staging --include-eol && $sis_generate_usn_cmd"
+        elif [ "$2" = "esm-apps" ]; then
+            sis_changes_cmd="$sis_changes_cmd --esm-merge-ppa ubuntu-esm/esm-apps-security-staging --include-eol && $sis_generate_usn_cmd"
+        else
+            echo "Usage: sis-changes merge [esm-apps/esm-infra]"
+            echo ""
+            echo "[!] merge option produces a combined USN for proposed and one of esm-apps/esm-infra"
+            echo "[!] For other cases please use sis-changes manually or consult"
+            echo "[!] https://wiki.ubuntu.com/SecurityTeam/UpdatePublication#Announce_Publication"
+            return 1
+        fi
     else
-        echo "Unknown PPA '$1'"
+        echo "Usage: sis-changes [private/proposed/esm-infra/esm-apps/merge]"
+        return 1
     fi
+    eval ${sis_changes_cmd}
     cd "$OLD_DIR"
     echo "Generated script ${USN_SCRIPT}"
 }