ccpp: update etags handling

Print the output variable assigned in the script in case that this
fails, otherwise it on the output without NL and will be prepended to
next var (if any).

This also simplifies the call in YAML.

Author: MartinPulec

.github/scripts/get-etag.sh

@@ -2,14 +2,19 @@
 # Prints to stdout ETag for given URL.
 # If failed to obtain and $2=optional the particular tag is replaced with a keyword NOTFOUND
 
-ETAG=$(curl -LI "$1" | grep -i '^etag' | sed 's/.*"\(.*\)".*/\1/')
+output=$1
+url=$2
+optional=${3-}
+
+ETAG=$(curl -LI "$url" | grep -i '^etag' | sed 's/.*"\(.*\)".*/\1/')
 if [ "$ETAG" ]; then
+        printf '%s=' "$output"
         printf '%s\n' "$ETAG" | sed 's/[^-._A-Za-z0-9]/_/g'
         exit 0
 fi
 
-if [ "${2-}" = optional ]; then
-        echo NOTFOUND
+if [ "$optional" = optional ]; then
+        echo "$1=NOTFOUND"
         exit 0
 fi
 

.github/workflows/ccpp.yml

@@ -62,9 +62,9 @@ jobs:
     - name: Fetch SDKs ETags
       id: etags
       run: |
-        { printf ndi=; $GITHUB_WORKSPACE/.github/scripts/get-etag.sh\
+        $GITHUB_WORKSPACE/.github/scripts/get-etag.sh ndi\
          https://downloads.ndi.tv/SDK/NDI_SDK_Linux/\
-        Install_NDI_SDK_v6_Linux.tar.gz; } >> $GITHUB_OUTPUT
+        Install_NDI_SDK_v6_Linux.tar.gz >> $GITHUB_OUTPUT
     - name: Run actions/cache for NDI
       id: cache-ndi
       uses: actions/cache@main
@@ -153,13 +153,13 @@ jobs:
     - name: Fetch SDKs ETags
       id: etags
       run: |
-        { printf nonfree=; $GITHUB_WORKSPACE/.github/scripts/get-etag.sh\
-         "$SDK_URL/$DELTA_MAC_ARCHIVE" optional; } >> $GITHUB_OUTPUT
-        { printf ndi=; $GITHUB_WORKSPACE/.github/scripts/get-etag.sh\
-         https://downloads.ndi.tv/SDK/NDI_SDK_Mac/Install_NDI_SDK_v6_Apple.pkg
-        } >> $GITHUB_OUTPUT
-        { printf ximea=; $GITHUB_WORKSPACE/.github/scripts/get-etag.sh\
-         "$XIMEA_DOWNLOAD_URL"; } >> $GITHUB_OUTPUT
+        $GITHUB_WORKSPACE/.github/scripts/get-etag.sh nonfree\
+         "$SDK_URL/$DELTA_MAC_ARCHIVE" optional >> $GITHUB_OUTPUT
+        $GITHUB_WORKSPACE/.github/scripts/get-etag.sh ndi\
+         https://downloads.ndi.tv/SDK/NDI_SDK_Mac/Install_NDI_SDK_v6_Apple.pkg\
+         >> $GITHUB_OUTPUT
+        $GITHUB_WORKSPACE/.github/scripts/get-etag.sh ximea\
+         "$XIMEA_DOWNLOAD_URL" >> $GITHUB_OUTPUT
     - name: Run actions/cache for Non-Free SDKs
       id: cache-macos-nonfree-sdks
       uses: actions/cache@main
@@ -249,11 +249,11 @@ jobs:
     - name: Fetch SDKs ETags
       id: etags
       run: |
-        { printf ndi=; $GITHUB_WORKSPACE/.github/scripts/get-etag.sh\
-         https://downloads.ndi.tv/SDK/NDI_SDK/NDI%206%20SDK.exe
-        } >> $GITHUB_OUTPUT
-        { printf ximea=; $GITHUB_WORKSPACE/.github/scripts/get-etag.sh\
-         "$XIMEA_DOWNLOAD_URL"; } >> $GITHUB_OUTPUT
+        $GITHUB_WORKSPACE/.github/scripts/get-etag.sh ndi\
+         https://downloads.ndi.tv/SDK/NDI_SDK/NDI%206%20SDK.exe\
+         >> $GITHUB_OUTPUT
+        $GITHUB_WORKSPACE/.github/scripts/get-etag.sh ximea\
+         "$XIMEA_DOWNLOAD_URL" >> $GITHUB_OUTPUT
     - name: Find MSVC
       run: .github/scripts/Windows/find_msvc.ps1
       shell: pwsh -command ". '{0}'"

.github/workflows/coverity-scan.yml

@@ -46,9 +46,9 @@ jobs:
       if: ${{ env.coverity_token }}
       id: etags
       run: |
-        { printf ndi=; $GITHUB_WORKSPACE/.github/scripts/get-etag.sh\
+        $GITHUB_WORKSPACE/.github/scripts/get-etag.sh ndi\
          https://downloads.ndi.tv/SDK/NDI_SDK_Linux/Install_NDI_SDK_v6_Linux.\
-        tar.gz; } >> $GITHUB_OUTPUT
+        tar.gz >> $GITHUB_OUTPUT
     - name: Run actions/cache for NDI
       if: ${{ env.coverity_token }}
       id: cache-ndi