epm play: fix version issues (installing by version package we get before)

pack.d/jetbrains-toolbox.sh

@@ -8,8 +8,9 @@ RETURNTARNAME="$2"
 # use version from tarball
 PKGNAME="$(basename $TAR .tar.gz)"
 
+# they packed AppImage to tarball, so unpack it
 erc $TAR || fatal
-cd $PKGNAME || fatal
+cd $PKGNAME* || fatal
 cp $PRODUCT $PKGNAME.AppImage || fatal
 
 return_tar $PKGNAME.AppImage

play.d/balena-etcher.sh

@@ -11,7 +11,7 @@ URL="https://etcher.io/"
 pkgtype=$(epm print info -p)
 case $pkgtype in
     rpm)
-        mask="balena-etcher-${VERSION}.x86_64.rpm"
+        mask="balena-etcher-${VERSION}-[1-9].x86_64.rpm"
         ;;
     *)
         mask="balena-etcher_${VERSION}_amd64.deb"

play.d/djv.sh

@@ -10,7 +10,7 @@ DESCRIPTION="DJV2 - Professional media review software for VFX, animation, and f
 pkgtype=$(epm print info -p)
 case $pkgtype in
     rpm)
-        mask="DJV2-${VERSION}.x86_64.rpm"
+        mask="DJV2-${VERSION}-[1-9].x86_64.rpm"
         ;;
     *)
         mask="DJV2_${VERSION}_amd64.deb"

play.d/edge.sh

@@ -8,4 +8,4 @@ DESCRIPTION="Microsoft Edge browser (dev) from the official site"
 
 . $(dirname $0)/common.sh
 
-epm install "https://packages.microsoft.com/repos/edge/pool/main/m/$PKGNAME/${PKGNAME}_${VERSION}_amd64.deb"
+epm install "https://packages.microsoft.com/repos/edge/pool/main/m/$PKGNAME/${PKGNAME}_${VERSION}-[12]_amd64.deb"

play.d/kubo.sh

@@ -17,6 +17,8 @@ if [ "$VERSION" = "*" ] ; then
     # v0.20.0_linux
     # kubo_v*.[0-9]_linux*.tar.gz
     [ "$PKGNAME" = "$BASEPKGNAME" ] && VERSION="*.[0-9]_" || VERSION="*-rc*_"
+else
+    VERSION="*_"
 fi
 
 arch="$(epm print info -a)"
@@ -36,5 +38,5 @@ case "$arch" in
 esac
 
 
-PKGURL="$(eget --list --latest https://github.com/ipfs/kubo/releases "${BASEPKGNAME}_v$VERSION$file")"
+PKGURL="$(eget --list --latest https://github.com/ipfs/kubo/releases "${BASEPKGNAME}_v${VERSION}$file")"
 epm pack --install $PKGNAME "$PKGURL"

play.d/librewolf.sh

@@ -13,16 +13,18 @@ arch=x86_64
 pkgtype=$(epm print info -p)
 case $pkgtype in
     rpm)
-        PKGURL="https://rpm.librewolf.net/pool/librewolf$VERSION.rpm"
+        # https://rpm.librewolf.net/pool/librewolf-124.0.1-1.fc38.x86_64.rpm
+        PKGURL="https://rpm.librewolf.net/pool/librewolf-$VERSION-[0-9]*.$arch.rpm"
         ;;
     *)
-        PKGURL="https://deb.librewolf.net/pool/focal/librewolf-$VERSION$arch.deb"
+        # https://deb.librewolf.net/pool/focal/librewolf-124.0.1-1.en-US.ubuntu20.x86_64.deb
+        PKGURL="https://deb.librewolf.net/pool/focal/librewolf-$VERSION-[0-9]*.$arch.deb"
         ;;
 esac
 
 if ! is_glibc_enough 2.35 ; then
     # use deb package for old glibc
-    PKGURL="https://deb.librewolf.net/pool/focal/librewolf-$VERSION$arch.deb"
+    PKGURL="https://deb.librewolf.net/pool/focal/librewolf-$VERSION-[0-9].$arch.deb"
 fi
 
 repack=''

play.d/novelwriter.sh

 #!/bin/sh
 
 PKGNAME=novelwriter
-SUPPORTEDARCHES="x86_64"
+SUPPORTEDARCHES=""
 VERSION="$2"
 DESCRIPTION="novelWriter - a markdown-like editor for novels"
 URL="https://github.com/vkbo/novelWriter"
@@ -11,6 +11,9 @@ URL="https://github.com/vkbo/novelWriter"
 arch=amd64
 pkgtype=deb
 
+# 2.4.b1 support
+[ "$VERSION" = "*" ] || VERSION="$VERSION*"
+
 # https://github.com/vkbo/novelWriter/releases/download/v2.0.7/novelwriter_2.0.7_all.deb
 PKGURL=$(eget --list --latest https://github.com/vkbo/novelWriter/releases "novelwriter_${VERSION}_all.$pkgtype") || fatal "Can't get package URL"
 

play.d/opera.sh

@@ -15,11 +15,11 @@ arch="amd64"
 epm install --skip-installed ffmpeg-plugin-browser || epm install --skip-installed chromium-codecs-ffmpeg-extra || epm play chromium-codecs-ffmpeg-extra
 
 if [ "$(epm print info -p)" = "rpm" ] ; then
-    override_pkgname "${PKGNAME/-/_}"
+    pkgname="${PKGNAME/-/_}"
 
     # they put all branch here (rpm only): https://rpm.opera.com/rpm/
     [ "$(epm print info -s)" = "alt" ] && repack='--repack' || repack=''
-    PKGURL="https://rpm.opera.com/rpm/$PKGNAME-$VERSION-linux-release-x64-signed.rpm"
+    PKGURL="https://rpm.opera.com/rpm/$pkgname-$VERSION-linux-release-x64-signed.rpm"
     epm install $repack "$PKGURL"
     exit
 fi

play.d/realvnc-server.sh

@@ -8,6 +8,11 @@ URL="https://www.realvnc.com/en/connect/download/vnc/"
 
 . $(dirname $0)/common.sh
 
+# vendor packages has shorted version, so drop latest version part (buildid)
+if [ "$VERSION" != "*" ] ; then
+    VERSION="$(echo "$VERSION" | sed -e 's|\.[0-9][0-9][0-9].*||')"
+fi
+
 pkgtype="$(epm print info -p)"
 arch="$(epm print info -a)"
 

play.d/realvnc-viewer.sh

@@ -8,6 +8,11 @@ URL="https://www.realvnc.com/en/connect/download/vnc/"
 
 . $(dirname $0)/common.sh
 
+# vendor packages has shorted version, so drop latest version part (buildid)
+if [ "$VERSION" != "*" ] ; then
+    VERSION="$(echo "$VERSION" | sed -e 's|\.[0-9][0-9][0-9].*||')"
+fi
+
 pkgtype="$(epm print info -p)"
 arch="$(epm print info -a)"
 
@@ -32,6 +37,8 @@ case $pkgtype-$arch in
         ;;
 esac
 
+# https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-7.10.0-Linux-x64.deb
+# https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-7.10.0-Linux-x64.rpm
 PKGURL=$(eget --list --latest https://www.realvnc.com/en/connect/download/viewer/ "$PKG") || fatal "Can't get package URL"
 
 epm $repack install $PKGURL

play.d/rpcs3.sh

@@ -8,6 +8,7 @@ URL="https://rpcs3.net/download"
 
 . $(dirname $0)/common.sh
 
+# https://github.com/RPCS3/rpcs3-binaries-linux/releases/download/build-fff0c96bf38d1ada075e524c4753a7f263c06449/rpcs3-v0.0.18-12817-fff0c96b_linux64.AppImage
 file="rpcs3-v${VERSION}-*-*_linux64.AppImage"
 
 PKGURL=$(eget --list --latest https://github.com/RPCS3/rpcs3-binaries-linux/releases "$file") || fatal "Can't get package URL"

play.d/rstudio.sh

@@ -9,11 +9,28 @@ URL="https://www.rstudio.com/products/rstudio"
 . $(dirname $0)/common.sh
 
 arch=x86_64
-pkgtype=$(epm print info -p)
+pkgtype="$(epm print info -p)"
+distr="$(epm print info -s)"
+
+case $pkgtype in
+    rpm)
+        PKGFILTER="rhel8"
+        ;;
+    *)
+        PKGFILTER="focal"
+        ;;
+esac
+
+#case "$distr" in
+#case
+
 repack=''
 
 case $(epm print info -e) in
-    Ubuntu/22*|Ubuntu/23*)
+    Ubuntu/20.*|Debian/11)
+        PKGFILTER="focal"
+        ;;
+    Ubuntu/22.*|Ubuntu/23*|Debian/12)
         PKGFILTER="jammy"
         ;;
     AstraLinux*|Debian/*|Ubuntu/*)
@@ -31,6 +48,9 @@ case $(epm print info -e) in
     Fedora/*|RHEL/9)
         PKGFILTER="rhel9"
         ;;
+    OpenSUSE/*)
+        PKGFILTER="opensuse15"
+        ;;
     ALTLinux/*)
         PKGFILTER="rhel8"
         repack='--repack'
@@ -40,6 +60,8 @@ case $(epm print info -e) in
         ;;
 esac
 
+VERSION="${VERSION/+/-}"
+
 PKGMASK="$(epm print constructname $PKGNAME "$VERSION" $arch $pkgtype "-" "-")"
 PKGURL="$(eget --list https://www.rstudio.com/products/rstudio/download/ "$PKGMASK" | grep "$PKGFILTER")" || fatal "Can't get package URL"
 

play.d/skype.sh

@@ -8,16 +8,11 @@ URL="https://skype.com"
 
 . $(dirname $0)/common.sh
 
-
 #arch=$(epm print info --distro-arch)
 #pkgtype=$(epm print info -p)
 pkgtype=deb
 
-if [ "$VERSION" != "*" ] ; then
-    # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=skypeforlinux-stable-bin
-    PKGURL="https://repo.skype.com/deb/pool/main/s/${PKGNAME}/${PKGNAME}_${VERSION}_amd64.deb"
-else
-    PKGURL="https://repo.skype.com/latest/$PKGNAME-64.$pkgtype"
-fi
+# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=skypeforlinux-stable-bin
+PKGURL="https://repo.skype.com/deb/pool/main/s/${PKGNAME}/${PKGNAME}_${VERSION}_amd64.deb"
 
 epm install "$PKGURL"

play.d/slack.sh

@@ -11,7 +11,8 @@ URL="https://slack.com"
 arch=x86_64
 pkgtype=rpm
 
-mask="$(epm print constructname $PKGNAME "$VERSION" $arch $pkgtype)"
+# https://downloads.slack-edge.com/desktop-releases/linux/x64/4.37.94/slack-4.37.94-0.1.el8.x86_64.rpm
+mask="$(epm print constructname $PKGNAME "$VERSION-[.09]*" $arch $pkgtype)"
 PKGURL="$(eget --list --latest https://slack.com/downloads/instructions/fedora "$mask")" || fatal "Can't get package URL"
 [ -n "$PKGURL" ] || fatal "Can't get package URL"
 

play.d/upscayl.sh

@@ -8,6 +8,9 @@ URL="https://github.com/upscayl/upscayl"
 
 . $(dirname $0)/common.sh
 
+# FIXME: they put some wrong version to X-AppImage-Version
+# https://github.com/upscayl/upscayl/issues/761
+
 PKGURL=$(eget --list --latest https://github.com/upscayl/upscayl/releases "upscayl-$VERSION-linux.AppImage") || fatal "Can't get package URL"
 
 epm install "$PKGURL"