From 13834e9c8dfdead174d413788237f6399096e61c Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Wed, 21 Feb 2024 18:57:35 -0500 Subject: [PATCH] Clame Antivirus: fix unstable upstream url and tag on thunar plugin corrects https://github.com/Botspot/pi-apps/commit/d2d2fcbfe9b9858315c8de5aba307d00fc3aab81 if returned version is of the form "0.08-2" then that gets used for both the tag and in the debian filename if returned version is of the form "0.08" then that gets used for the tag and the debian filename "-1" gets added onto the end of the version --- .github/workflows/updates/Clam Antivirus.sh | 3 ++- apps/Clam Antivirus/install | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updates/Clam Antivirus.sh b/.github/workflows/updates/Clam Antivirus.sh index 02de1f0918..372fed24ab 100755 --- a/.github/workflows/updates/Clam Antivirus.sh +++ b/.github/workflows/updates/Clam Antivirus.sh @@ -3,6 +3,7 @@ webVer[0]=$(get_release dave-theunsub/clamtk) webVer[1]=$(get_release dave-theunsub/thunar-sendto-clamtk) all_url[0]="https://github.com/dave-theunsub/clamtk/releases/download/v${webVer[0]}/clamtk_${webVer[0]}-1_all.deb" -all_url[1]="https://github.com/dave-theunsub/thunar-sendto-clamtk/releases/download/v${webVer[1]}/thunar-sendto-clamtk_${webVer[1]}_all.deb" +deb_minor_version=${webVer[1]/${webVer[1]%-*}/} +all_url[1]="https://github.com/dave-theunsub/thunar-sendto-clamtk/releases/download/v${webVer[1]}/thunar-sendto-clamtk_${webVer[1]%-*}${deb_minor_version:--1}_all.deb" source $GITHUB_WORKSPACE/.github/workflows/update_github_script.sh \ No newline at end of file diff --git a/apps/Clam Antivirus/install b/apps/Clam Antivirus/install index 8e5af0e677..df31cd59ea 100755 --- a/apps/Clam Antivirus/install +++ b/apps/Clam Antivirus/install @@ -7,7 +7,8 @@ install_packages clamav https://github.com/dave-theunsub/clamtk/releases/downloa #if thunar file manager installed then also install clamtk thunar extension if command -v thunar >/dev/null ;then status "Installing ClamAV Thunar extension because you have Thunar installed..." - install_packages https://github.com/dave-theunsub/thunar-sendto-clamtk/releases/download/v${version2}/thunar-sendto-clamtk_${version2}-1_all.deb + deb_minor_version=${version2/${version2%-*}/} + install_packages https://github.com/dave-theunsub/thunar-sendto-clamtk/releases/download/v${version2}/thunar-sendto-clamtk_${version2%-*}${deb_minor_version:--1}_all.deb fi exit 0