epm play: use --distro-arch/--debian-arch instead of arch cases

play.d/deltachat.sh

@@ -17,18 +17,7 @@ case "$(epm print info -p)" in
         pkgtype=deb ;;
 esac
 
-if [ $pkgtype = 'deb' ]; then
-    case $(epm print info -a) in
-        x86_64)
-            arch=amd64 ;;
-        aarch64)
-            arch=arm64 ;;
-        *)
-            fatal "Unsupported arch $arch for $(epm print info -d)"
-    esac
-else
-    arch=$(epm print info -a)
-fi
+arch=$(epm print info --distro-arch)
 
 PKGURL=$(eget --list --latest https://delta.chat/ru/download "deltachat-desktop*$arch.$pkgtype")
 

play.d/figma.sh

@@ -11,29 +11,9 @@ URL="https://github.com/Figma-Linux/figma-linux"
 [ "$VERSION" = "*" ] && VERSION="[0-9]*"
 
 pkgtype="$(epm print info -p)"
+arch="$(epm print info --distro-arch)"
 
-if [ "$pkgtype" == "rpm" ] ; then
-    case "$(epm print info -a)" in
-        x86_64)
-            file="${PKGNAME}_${VERSION}_linux_x86_64.$pkgtype" ;;
-        aarch64)
-            file="${PKGNAME}_${VERSION}_linux_aarch64.$pkgtype" ;;
-    esac
-elif [ "$pkgtype" == "deb" ] ; then
-    case "$(epm print info -a)" in
-        x86_64)
-            file="${PKGNAME}_${VERSION}_linux_amd64.$pkgtype" ;;
-        aarch64)
-            file="${PKGNAME}_${VERSION}_linux_arm64.$pkgtype" ;;
-    esac
-elif [ "$pkgtype" == "pacman" ] ; then
-    case "$(epm print info -a)" in
-        x86_64)
-            file="${PKGNAME}_${VERSION}_linux_x64.$pkgtype" ;;
-        aarch64)
-            file="${PKGNAME}_${VERSION}_linux_aarch64.$pkgtype" ;;
-    esac
-fi
+file="${PKGNAME}_${VERSION}_linux_$arch.$pkgtype"
 
 PKGURL=$(eget --list --latest https://github.com/Figma-Linux/figma-linux/releases "$file")
 

play.d/freetube.sh

@@ -8,14 +8,7 @@ URL="https://freetubeapp.io/"
 
 . $(dirname $0)/common.sh
 
-case "$(epm print info -a)" in
-    aarch64)
-        arch="arm64" ;;
-    armhf)
-        arch="armv7l" ;;
-    x86_64)
-        arch="amd64" ;;
-esac
+arch="$(epm print info --debian-arch)"
 
 PKGURL=$(eget --list --latest https://github.com/FreeTubeApp/FreeTube/releases "freetube*${VERSION}*${arch}.deb")
 

play.d/goofcord.sh

 #!/bin/sh
 
 PKGNAME=goofcord
-SUPPORTEDARCHES="x86_64 arm64"
+SUPPORTEDARCHES="x86_64 aarch64"
 VERSION="$2"
 DESCRIPTION="The highly configurable and privacy minded discord client"
 URL="https://github.com/Milkshiift/GoofCord/"
 
 . $(dirname $0)/common.sh
 
-arch="$(epm print info -a)"
-case "$arch" in
-    x86_64)
-        arch=amd64
-        ;;
-    aarch64)
-        arch=arm64
-        ;;
-    *)
-        fatal "$arch arch is not supported"
-        ;;
-esac
-
+arch="$(epm print info --debian-arch)"
 
 pkgtype=deb
 

play.d/headscale.sh

@@ -8,14 +8,9 @@ URL="https://github.com/juanfont/headscale"
 
 . $(dirname $0)/common.sh
 
-case "$(epm print info -a)" in
-    x86_64)
-        arch="amd64" ;;
-    aarch64)
-        arch="arm64" ;;
-    armhf)
-        arch="armv7l" ;;
-    i586)
+arch="$(epm print info --debian-arch)"
+case "$arch" in
+    i386)
         arch="386" ;;
 esac
 

play.d/iptvnator.sh

@@ -8,15 +8,7 @@ URL="https://github.com/4gray/iptvnator"
 
 . $(dirname $0)/common.sh
 
-arch=$(epm print info -a)
-case "$arch" in
-    x86_64)
-        arch=amd64
-        ;;
-    aarch64)
-        arch=arm64
-        ;;
-esac
+arch=$(epm print info --debian-arch)
 
 pkgtype=deb
 

play.d/librewolf.sh

@@ -8,10 +8,9 @@ URL="https://librewolf.net/"
 
 . $(dirname $0)/common.sh
 
-arch=x86_64
+arch="$(epm print info -a)"
 
-
-if [ "$(epm print info -a)" = "aarch64" ]; then
+if [ "$arch" = "aarch64" ]; then
     arch="arm64"
 fi
 

play.d/mattermost-desktop.sh

@@ -8,18 +8,7 @@ URL="https://mattermost.com/"
 
 . $(dirname $0)/common.sh
 
-arch="$(epm print info -a)"
-case "$arch" in
-    x86_64)
-        arch=amd64
-        ;;
-    aarch64)
-        arch=arm64
-        ;;
-    *)
-        fatal "$arch arch is not supported"
-        ;;
-esac
+arch="$(epm print info --debian-arch)"
 
 PKGURL=$(get_github_url "https://github.com/mattermost/desktop/" "$(epm print constructname $PKGNAME ".$VERSION*" $arch "deb")")
 

play.d/min.sh

@@ -8,22 +8,10 @@ URL="https://github.com/minbrowser/min"
 
 . $(dirname $0)/common.sh
 
-arch="$(epm print info -a)"
-case "$arch" in
-x86_64)
-    file="min-${VERSION}-amd64.deb"
-    ;;
-aarch64)
-    file="min-${VERSION}-arm64.deb"
-    ;;
-armhf)
-    file="min-${VERSION}-armv7l.deb"
-    ;;
-*)
-    fatal "$arch arch is not supported"
-    ;;
-esac
+arch="$(epm print info --debian-arch)"
 
-PKGURL="$(eget --list --latest "${URL}"/releases "${file}")"
+file="min-${VERSION}-${arch}.deb"
+
+PKGURL="$(eget --list --latest "https://github.com/minbrowser/min/releases "$file")"
 
 install_pkgurl

play.d/netbird.sh

 #!/bin/sh
 
 PKGNAME=netbird
-SUPPORTEDARCHES="x86_64 aarch64 i386 armv6l"
+SUPPORTEDARCHES="x86_64 aarch64 x86 armv6l"
 VERSION="$2"
 DESCRIPTION="Secure WireGuard® overlay network with SSO/MFA."
 URL="https://github.com/netbirdio/netbird"
 
 . $(dirname $0)/common.sh
 
-arch="$(epm print info -a)"
+arch="$(epm print info --debian-arch)"
 case "$arch" in
-x86_64)
-    arch="amd64"
-    ;;
-aarch64)
-    arch="arm64"
-    ;;
-i386 | i686)
+i386)
     arch="386"
     ;;
 armv6l | armv7l)

play.d/tabby.sh

@@ -8,13 +8,11 @@ URL="https://github.com/Eugeny/tabby"
 
 . $(dirname $0)/common.sh
 
-case "$(epm print info -a)" in
+
+arch="$(epm print info --debian-arch)"
+case "$arch" in
     x86_64)
         arch="x64" ;;
-    aarch64)
-        arch="arm64" ;;
-    armhf)
-        arch="armv7l" ;;
 esac
 
 case "$(epm print info -p)" in

play.d/vesktop.sh

@@ -10,12 +10,7 @@ URL="https://github.com/Vencord/Vesktop"
 
 warn_version_is_not_supported
 
-case "$(epm print info -a)" in
-    x86_64)
-        arch="amd64" ;;
-    aarch64)
-        arch="arm64" ;;
-esac
+arch="$(epm print info --debian-arch)"
 
 PKGURL="https://vencord.dev/download/vesktop/$arch/appimage"
 

play.d/webcord.sh

 #!/bin/sh
 
 PKGNAME=WebCord
-SUPPORTEDARCHES="x86_64 arm64"
+SUPPORTEDARCHES="x86_64 aarch64"
 VERSION="$2"
 DESCRIPTION="A Discord and Spacebar client implemented directly without Discord API from the official github"
 URL="https://github.com/SpacingBat3/WebCord"

play.d/windscribe.sh

@@ -8,15 +8,7 @@ URL="https://github.com/Windscribe/Desktop-App"
 
 . $(dirname $0)/common.sh
 
-arch="$(epm print info -a)"
-case "$arch" in
-    x86_64)
-        arch=amd64
-        ;;
-    aarch64)
-        arch=arm64
-        ;;
-esac
+arch="$(epm print info --debian-arch)"
 
 if [ "$VERSION" = "*" ] ; then
     PKGURL=$(get_github_url "https://github.com/Windscribe/Desktop-App/" "${PKGNAME}_.${VERSION}_$arch.deb")

play.d/yandex-music.sh

@@ -8,20 +8,11 @@ URL="https://github.com/cucumber-sp/yandex-music-linux/releases"
 
 . $(dirname $0)/common.sh
 
-arch="$(epm print info -a)"
+arch="$(epm print info --debian-arch)"
 case "$arch" in
-    x86_64)
-        arch=amd64
-        ;;
-    aarch64)
-        arch=arm64
-        ;;
-    armhf)
+    armv7l)
         arch=armhf
         ;;
-    *)
-        fatal "$arch arch is not supported"
-        ;;
 esac
 
 PKGURL=$(eget --list --latest https://github.com/cucumber-sp/yandex-music-linux/releases "yandex-music_${VERSION}_${arch}.deb")

play.d/youtube-music.sh

 #!/bin/sh
 
 PKGNAME=YouTube-Music
-SUPPORTEDARCHES="x86_64 armv7l aarch64"
+SUPPORTEDARCHES="x86_64 armhf aarch64"
 VERSION="$2"
 DESCRIPTION="YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)"
 URL="https://github.com/th-ch/youtube-music"

play.d/yucca.sh

 #!/bin/sh
 
 PKGNAME=yucca
-SUPPORTEDARCHES="x86_64 armv7l aarch64"
+SUPPORTEDARCHES="x86_64 armhf aarch64"
 VERSION="$2"
 DESCRIPTION="Simple solution for video surveillance"
 URL="https://yucca.app/"
 
 . $(dirname $0)/common.sh
 
-case $(epm print info -a) in
-    x86_64)
-        arch=amd64 ;;
+arch="$(epm print info --debian-arch)"
+case "$arch" in
     armv7l)
         arch=arm ;;
-    aarch64)
-        arch=arm64 ;;
-    *)
-        fatal "Unsupported arch $arch for $(epm print info -d)"
 esac
 
 if [ "$VERSION" = "*" ] ; then