From 1060e1619a84f100c2d4f296f6bc1fb09a8d8c56 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Mon, 3 Nov 2025 10:16:17 -0500
Subject: [PATCH 1/2] fix artifact retrieval

---
 .github/workflows/external_trigger.yml | 3 +--
 Dockerfile                             | 7 ++++---
 jenkins-vars.yml                       | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index 0eac269..fc18a36 100644
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -111,8 +111,7 @@ jobs:
             exit 0
           else
             assets=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/mltframework/shotcut/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url')
-            SHOTCUT_SHORT_VER=$(echo ${EXT_RELEASE} | sed 's|[v.]||g')
-            if grep -q "shotcut-linux-x86_64-${SHOTCUT_SHORT_VER}.txz$" <<< "${assets}"; then
+            if grep -q "x86_64" | grep -q ".txz" <<< "${assets}"; then
               artifacts_found="true"
             else
               artifacts_found="false"
diff --git a/Dockerfile b/Dockerfile
index df3b615..dbdce06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,10 +31,11 @@ RUN \
     SHOTCUT_RELEASE=$(curl -sX GET "https://api.github.com/repos/mltframework/shotcut/releases/latest" \
     | jq -r .tag_name); \
   fi && \
-  SHOTCUT_SHORT_VER=$(echo ${SHOTCUT_RELEASE} | sed 's|[v.]||g') && \
-  curl -o \
+  SHOTCUT_URL=$(curl -sX GET "https://api.github.com/repos/mltframework/shotcut/releases/tags/${SHOTCUT_RELEASE}" | jq -r '.assets[].browser_download_url' \
+    | grep "x86_64" | grep ".txz") && \
+  curl -fo \
     /tmp/shotcut-tarball.txz -L \
-    "https://github.com/mltframework/shotcut/releases/download/${SHOTCUT_RELEASE}/shotcut-linux-x86_64-${SHOTCUT_SHORT_VER}.txz" && \
+    "${SHOTCUT_URL}" && \
   tar xvf /tmp/shotcut-tarball.txz -C \
     /app/shotcut --strip-components=2 && \
   echo "**** cleanup ****" && \
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 4211b1f..c9d711d 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -8,8 +8,7 @@ release_tag: latest
 ls_branch: main
 external_artifact_check: |
   assets=$(curl -u "${{ '{{' }} secrets.CR_USER {{ '}}' }}:${{ '{{' }} secrets.CR_PAT {{ '}}' }}" -sX GET "https://api.github.com/repos/mltframework/shotcut/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url')
-  SHOTCUT_SHORT_VER=$(echo ${EXT_RELEASE} | sed 's|[v.]||g')
-  if grep -q "shotcut-linux-x86_64-${SHOTCUT_SHORT_VER}.txz$" <<< "${assets}"; then
+  if grep -q "x86_64" | grep -q ".txz" <<< "${assets}"; then
     artifacts_found="true"
   else
     artifacts_found="false"

From 695d7e0135bf7f06832cba5e5bd3ee0bf7c8d049 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Mon, 3 Nov 2025 10:41:40 -0500
Subject: [PATCH 2/2] tarball structure also changed

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index dbdce06..6a0c0b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN \
     /tmp/shotcut-tarball.txz -L \
     "${SHOTCUT_URL}" && \
   tar xvf /tmp/shotcut-tarball.txz -C \
-    /app/shotcut --strip-components=2 && \
+    /app/shotcut --strip-components=1 && \
   echo "**** cleanup ****" && \
   apt-get clean && \
   rm -rf \