epm play: fix URL with fixed eget wildcards

play.d/64gram.sh

@@ -5,8 +5,7 @@ SUPPORTEDARCHES="x86_64"
 DESCRIPTION="64Gram (unofficial Telegram Desktop)"
 TIPS="Run 'epm play 64gram=<version>' to install the version of the 64Gram Telegram client."
 
-BRANCH="[0-9]"
-VERSION=".*$BRANCH"
+VERSION="*[0-9]"
 [ -n "$2" ] && [ "$2" != "beta" ] && VERSION="$2"
 
 . $(dirname $0)/common.sh

play.d/myoffice.sh

@@ -12,15 +12,14 @@ fi
 
 . $(dirname $0)/common.sh
 
-arch=$(epm print info --distro-arch)
 pkgtype=$(epm print info -p)
 
 # /var/lib/dpkg/info/myoffice-standard-home-edition.postinst: line 62: xdg-desktop-menu: command not found
 epm assure xdg-desktop-menu xdg-utils
 
-# https://preset.myoffice-app.ru/myoffice-standard-home-edition_2022.01-1.28.0.4_amd64
-PKGMASK="$(epm print constructname $PKGNAME "*" $arch)"
-PKG="$(epm tool eget --list --latest https://myoffice.ru/products/standard-home-edition/ $PKGMASK)" || fatal "Can't get package URL"
-
+# https://preset.myoffice-app.ru/myoffice-standard-home-edition-2.3.0-x86_64.rpm
+# https://preset.myoffice-app.ru/myoffice-standard-home-edition_2.3.0_amd64.deb
+PKGMASK="$(epm print constructname $PKGNAME "*" "" "" "" "[-_]")"
+PKG="$(epm tool eget --list --latest https://myoffice.ru/products/standard-home-edition/ "$PKGMASK")" || fatal "Can't get package URL"
 
 epm install "$PKG"

play.d/rstudio.sh

@@ -35,7 +35,7 @@ case $(epm print info -e) in
         ;;
 esac
 
-PKGMASK="$(epm print constructname $PKGNAME "*" $arch $pkgtype)"
+PKGMASK="$(epm print constructname $PKGNAME "*" $arch $pkgtype "-" "-")"
 PKG="$(epm tool eget --list https://www.rstudio.com/products/rstudio/download/ $PKGMASK | grep $PKGFILTER)" || fatal "Can't get package URL"
 [ -n "$PKG" ] || fatal "Can't get package URL"
 

play.d/signal.sh

@@ -7,6 +7,6 @@ DOWNURL="https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop"
 
 . $(dirname $0)/common.sh
 
-URL=$(epm tool eget --list --latest http://mirror.cs.uchicago.edu/signal/pool/main/s/signal-desktop/ '*.amd64.deb')
+URL=$(epm tool eget --list --latest http://mirror.cs.uchicago.edu/signal/pool/main/s/signal-desktop/ '${PKGNAME}_*_amd64.deb')
 URL=$(echo "$URL" | sed -e "s|\(.*/\)|$DOWNURL/|")
 epm install "$URL"

play.d/sweethome3d.sh

@@ -25,7 +25,7 @@ esac
 #PKGURL="http://download.sourceforge.net/project/sweethome3d/SweetHome3D/SweetHome3D-$VERSION/SweetHome3D-$VERSION-linux-$arch.tgz"
 
 # http://sourceforge.net/projects/sweethome3d/files/SweetHome3D/SweetHome3D-7.1/SweetHome3D-7.1-linux-x86.tgz/download
-URL="$(eget -4 --list --latest https://www.sweethome3d.com/download.jsp SweetHome3D-.*-linux-$arch.tgz/download)"
+URL="$(eget -4 --list --latest https://www.sweethome3d.com/download.jsp SweetHome3D-*-linux-$arch.tgz/download)"
 PKGURL="$(echo "$URL" | sed -e "s|http://sourceforge.net/projects/sweethome3d/files|http://download.sourceforge.net/project/sweethome3d|" -e 's|/download$||' )"
 
 epm install "$PKGURL"

play.d/telegram.sh

@@ -12,7 +12,7 @@ if echo "$2" | grep -q "beta" || epm installed Telegram-beta ; then
     PKGNAME=$PKGNAME-$BRANCH
 fi
 
-VERSION=".*$BRANCH"
+VERSION="*$BRANCH"
 [ -n "$2" ] && [ "$2" != "beta" ] && VERSION="$2"
 
 . $(dirname $0)/common.sh