epm play.d/common.sh: implement install_pkgurl and install_pack_pkgurl and use…

play.d/1c-connect.sh

@@ -9,6 +9,7 @@ URL="https://1c-connect.com"
 . $(dirname $0)/common.sh
 
 warn_version_is_not_supported
+
 PKGURL="https://updates.1c-connect.com/desktop/distribs/1C-Connect-Linux-x64.tar.gz"
 
-epm pack --install $PKGNAME "$PKGURL"
+install_pack_pkgurl

play.d/aimp.sh

@@ -25,7 +25,4 @@ case $pkgtype in
         ;;
 esac
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm $repack install "$PKGURL"
+install_pkgurl

play.d/anydesk.sh

@@ -19,10 +19,6 @@ case $arch in
         fatal "Unsupported arch $arch for $(epm print info -d)"
 esac
 
-# we have workaround for their postinstall script, so always repack rpm package
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
 # rpm packages have a release in their names
 [ "$(epm print info -p)" = "rpm" ] && [ "$VERSION" != "*" ] && VERSION="$VERSION-1"
 
@@ -43,7 +39,7 @@ PKGMASK="$(epm print constructname $PKGNAME "$VERSION" $arch '' '_')"
 
 PKGURL="$(eget --list --latest https://download.anydesk.com/linux/ "./$PKGMASK")" || fatal "Can't get package URL"
 
-epm $repack install "$PKGURL" || exit
+install_pkgurl
 
 echo
 echo "Note: run

play.d/atom.sh

@@ -25,4 +25,4 @@ else
     PKGURL=$(eget --list https://github.com/atom/atom/releases/ "atom-$arch.$pkgtype" | grep $notbeta -- "-beta" | head -n1) || fatal "Can't get package URL"
 fi
 
-epm install "$PKGURL"
+install_pkgurl

play.d/audiorelay.sh

@@ -14,4 +14,6 @@ VERSION="0.27.5"
 
 # https://audiorelay.net/downloads
 # TODO: https://api.audiorelay.net/downloads
-epm install "https://dl.audiorelay.net/setups/linux/audiorelay-$VERSION.deb"
+PKGURL="https://dl.audiorelay.net/setups/linux/audiorelay-$VERSION.deb"
+
+install_pkgurl

play.d/balena-etcher.sh

@@ -20,7 +20,4 @@ esac
 
 PKGURL=$(eget --list --latest https://github.com/balena-io/etcher/releases "$mask") || fatal "Can't get package URL"
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm install $repack "$PKGURL"
+install_pkgurl

play.d/bitrix24.sh

@@ -20,7 +20,4 @@ case $pkgtype in
         ;;
 esac
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm install $repack "$PKGURL"
+install_pkgurl

play.d/bitwarden.sh

@@ -23,8 +23,5 @@ esac
 
 PKGURL=$(eget --list --latest https://github.com/bitwarden/clients/releases $(epm print constructname Bitwarden "$VERSION*" $arch $pkgtype "-" "-")) || fatal "Can't get package URL"
 
-# we have workaround for their postinstall script, so always repack rpm package
-[ "$pkgtype" = "deb" ] || repack='--repack'
-
-epm install $repack "$PKGURL" || exit
+install_pkgurl
 

play.d/bitwig-studio.sh

@@ -14,4 +14,4 @@ else
     PKGURL="https://downloads.bitwig.com/$VERSION/bitwig-studio-$VERSION.deb"
 fi
 
-epm install $PKGURL
+install_pkgurl

play.d/brave.sh

@@ -8,16 +8,9 @@ DESCRIPTION="Brave browser from the official site"
 
 . $(dirname $0)/common.sh
 
-repack=''
-# we have workaround for their postinstall script, so always repack rpm package
-#[ "$(epm print info -p)" = "deb" ] || repack='--repack'
-# repack for deb too, they have broken dependency on brave-keyring
-repack='--repack'
-
 # brave-browser-beta-1.51.105-1.x86_64.rpm
 # brave-browser-beta_1.51.105_amd64.deb
 
-
 # rpm packages have a release in their names
 [ "$(epm print info -p)" = "rpm" ] && [ "$VERSION" != "*" ] && VERSION="$VERSION-1"
 
@@ -26,12 +19,13 @@ repack='--repack'
 
 PKGURL=$(eget --list --latest https://github.com/brave/brave-browser/releases $(epm print constructname $PKGNAME "$VERSION"))
 
+# some hack
 if [ -z "$PKGURL" ] ; then
     # force use beta if can't get stable version
     if [ "$PKGNAME" = "$BASEPKGNAME" ] ; then
         TOREMOVEPKG=$PKGNAME
         override_pkgname "$BASEPKGNAME-beta"
-        PKGURL=$(eget --list --latest https://github.com/brave/brave-browser/releases "$(epm print constructname $PKGNAME "$VERSION")")
+        PKGURL=$(eget --list --latest https://github.com/brave/brave-browser/releases "$(epm print constructname $PKGNAME "$VERSION")") #"
         [ -n "$PKGURL" ] || fatal "Can't get package URL"
 
         echo "Force switching from $TOREMOVEPKG to $PKGNAME ... "
@@ -41,4 +35,7 @@ if [ -z "$PKGURL" ] ; then
     fi
 fi
 
-epm $repack install "$PKGURL"
+# we have workaround for their postinstall script, so always repack rpm package
+# repack for deb too, they have broken dependency on brave-keyring
+# install_pkgurl
+epm install --repack "$PKGURL"

play.d/cascadeur.sh

@@ -14,7 +14,7 @@ warn_version_is_not_supported
 VERSION="2022.3.1"
 PKGURL="ipfs://Qma8WF8iPwgKNPM6UdZHWse4q1cTnPAvjMRkGsbbWYi18w?filename=cascadeur-linux.tgz"
 # TODO: ask license
-epm pack --install $PKGNAME "$PKGURL" "$VERSION"
+install_pack_pkgurl "$VERSION"
 exit
 
 # (liblapack.so.3)
@@ -25,5 +25,4 @@ VERSION=$(echo "$page" | grep 'main-download__info-version' | sed -e 's|.*<div c
 PKGURL="https://cdn.cascadeur.com/builds/linux/$BUILDID/cascadeur-linux_$VERSION.tgz"
 
 # TODO: ask license
-epm pack --install $PKGNAME "$PKGURL" "$VERSION"
-
+install_pack_pkgurl "$VERSION"

play.d/chatgpt-desktop.sh

@@ -13,4 +13,4 @@ is_openssl_enough 3 || fatal "There is no needed OpenSSL 3 in the system."
 # https://github.com/lencx/ChatGPT/releases/download/v1.0.0/ChatGPT_1.0.0_linux_x86_64.deb
 PKGURL=$(eget --list --latest https://github.com/lencx/ChatGPT/releases/ "ChatGPT_${VERSION}_linux_x86_64.deb") || fatal "Can't get package URL"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/chrome-remote-desktop.sh

@@ -10,17 +10,12 @@ DESCRIPTION='' # echo " Remote desktop support for google-chrome & chromium" &&
 echo "Note: It is not tested yet."
 
 #arch=$(epm print info --distro-arch)
-#pkgtype=$(epm print info -p)
-repack=''
 arch=amd64
 pkgtype=deb
 
-# we have workaround for their postinstall script, so always repack rpm package
-[ "$(epm print info -p)" = "deb" ] || repack='--repack'
+PKGURL="https://dl.google.com/linux/direct/${PKGNAME}_current_$arch.$pkgtype"
 
-PKG="https://dl.google.com/linux/direct/${PKGNAME}_current_$arch.$pkgtype"
-
-epm install $repack "$PKG" || exit
+install_pkgurl
 
 echo '
 You need run

play.d/chrome.sh

@@ -9,10 +9,6 @@ URL="https://www.google.com/chrome/"
 . $(dirname $0)/common.sh
 
 _channel="stable"
-repack=''
-
-# we have workaround for their postinstall script, so always repack rpm package
-[ "$(epm print info -p)" = "deb" ] || repack='--repack'
 
 if [ "$VERSION" = "*" ] ; then
     PKGURL="https://dl.google.com/linux/direct/google-chrome-stable_current_$arch.$pkgtype"
@@ -20,4 +16,4 @@ else
     PKGURL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-${_channel}/google-chrome-${_channel}_${VERSION}-1_amd64.deb"
 fi
 
-epm install $repack "$PKGURL"
+install_pkgurl

play.d/chromium-gost.sh

@@ -10,10 +10,9 @@ DESCRIPTION="Chromium with GOST support from the official site"
 . $(dirname $0)/common.sh
 
 #arch=$(epm print info --distro-arch)
-#pkgtype=$(epm print info -p)
 arch=amd64
 pkgtype=deb
 
 PKGURL=$(eget --list --latest https://github.com/deemru/chromium-gost/releases "chromium-gost-$VERSION-linux-$arch.$pkgtype") || fatal "Can't get package URL"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/clion.sh

@@ -10,4 +10,4 @@ URL="https://www.jetbrains.com/clion/"
 
 PKGURL="$(get_jetbrains_pkgurl CL cpp)"
 
-epm install $PKGURL
+install_pkgurl

play.d/clipgrab.sh

@@ -14,4 +14,4 @@ else
     PKGURL="$(eget --list --latest https://clipgrab.org/ "ClipGrab-*-x86_64.AppImage")" || fatal "Can't get package URL"
 fi
 
-epm install $PKGURL
+install_pkgurl

play.d/code.sh

@@ -26,16 +26,13 @@ esac
 
 pkgtype="$(epm print info -p)"
 
-# we have workaround for their postinstall script, so always repack rpm package
-[ "$pkgtype" = "deb" ] || repack='--repack'
-
 if [ "$VERSION" != "*" ] ; then
-    URL="https://update.code.visualstudio.com/$VERSION/linux-$pkgtype-$arch/stable"
+    PKGURL="https://update.code.visualstudio.com/$VERSION/linux-$pkgtype-$arch/stable"
 else
-    URL="https://code.visualstudio.com/sha/download?build=stable&os=linux-$pkgtype-$arch"
+    PKGURL="https://code.visualstudio.com/sha/download?build=stable&os=linux-$pkgtype-$arch"
 fi
 
-epm install $repack "$URL" || exit
+install_pkgurl
 
 echo
 echo "NOTE: VS Code is a proprietary build. We recommend you to use open source editors: Codium, Atom."

play.d/codium.sh

@@ -30,10 +30,8 @@ case "$arch-$pkgtype" in
 esac
 
 
-PKGURL="$(eget --list --latest https://github.com/VSCodium/vscodium/releases "$(epm print constructname $PKGNAME "$VERSION*" $arch $pkgtype)")" || fatal "Can't get package URL"
+mask="$(epm print constructname $PKGNAME "$VERSION*" $arch $pkgtype)"
+PKGURL="$(eget --list --latest https://github.com/VSCodium/vscodium/releases "$mask")" || fatal "Can't get package URL"
 
-# we have workaround for their postinstall script, so always repack rpm package
-[ "$pkgtype" = "deb" ] || repack='--repack'
-
-epm install $repack "$PKGURL" || exit
+install_pkgurl
 

play.d/commfort-client.sh

@@ -14,6 +14,6 @@ VERSION="$(eget -O- https://www.commfort.com/ru/download.shtml  | grep "Верс
 [ -n "$VERSION" ] || fatal "Can't get version."
 
 # TODO: check: https://www.commfort.com/download/commfort_client.msi
-INSTALLURL="https://www.commfort.com/download/commfort_client_wine.exe"
+PKGURL="https://www.commfort.com/download/commfort_client_wine.exe"
 
-epm pack --install $PKGNAME $INSTALLURL $VERSION
+install_pack_pkgurl $VERSION

play.d/common.sh

@@ -104,6 +104,37 @@ override_pkgname()
     export EEPM_INTERNAL_PKGNAME="$PKGNAME"
 }
 
+# epm install $PKGURL
+install_pkgurl()
+{
+    local repack=''
+    local pkgtype="$(epm print info -p)"
+
+    # we have workaround for their postinstall script, so always repack rpm package
+    # TODO: repack for deb systems too
+    [ "$pkgtype" = "rpm" ] && repack='--repack'
+
+    [ -n "$PKGURL" ] || fatal "Can't get package URL"
+
+    epm install $repack "$PKGURL" "$@" || exit
+}
+
+# epm pack --install $PKGNAME "$PKGURL"
+install_pack_pkgurl()
+{
+    local repack=''
+    local pkgtype="$(epm print info -p)"
+
+    # we have workaround for their postinstall script, so always repack rpm package
+    # TODO: repack for deb systems too
+    [ "$pkgtype" = "rpm" ] && repack='--repack'
+
+    [ -n "$PKGURL" ] || fatal "Can't get package URL"
+
+    epm pack $repack --install $PKGNAME "$PKGURL" "$@"
+}
+
+
 get_latest_version()
 {
     local ver

play.d/cuda-z.sh

@@ -20,7 +20,6 @@ case "$arch" in
         ;;
 esac
 
-#pkgtype="$(epm print info -p)"
-
 PKGURL="$(eget --list --latest https://cuda-z.sourceforge.net/ "$file" )" || fatal "Can't get package URL"
-epm pack --install $PKGNAME "$PKGURL"
+
+install_pack_pkgurl

play.d/dbeaver.sh

@@ -20,4 +20,4 @@ case $pkgtype in
         ;;
 esac
 
-epm install "$PKGURL"
+install_pkgurl

play.d/discord.sh

@@ -14,4 +14,4 @@ else
     PKGURL="https://dl.discordapp.net/apps/linux/$VERSION/discord-$VERSION.deb"
 fi
 
-epm install "$PKGURL"
+install_pkgurl

play.d/djv.sh

@@ -21,7 +21,4 @@ arch=amd64
 
 PKGURL=$(eget --list --latest https://github.com/darbyjohnston/DJV/releases "$mask") || fatal "Can't get package URL"
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm install $repack "$PKGURL"
+install_pkgurl

play.d/docker-desktop.sh

@@ -20,10 +20,9 @@ case $pkgtype in
         ;;
 esac
 
-repack=''
-if [ "$(epm print info -s)" = "alt" ] ; then
-    PKGURL="https://desktop.docker.com/linux/main/amd64/139021/docker-desktop-4.28.0-amd64.deb"
-    repack='--repack'
-fi
+# TODO: rpm and deb packages has diffent binaries
+#if [ "$(epm print info -s)" = "alt" ] ; then
+#    PKGURL="https://desktop.docker.com/linux/main/amd64/139021/docker-desktop-4.28.0-amd64.deb"
+#fi
 
-epm install $repack "$PKGURL"
+install_pkgurl

play.d/draw.io.sh

@@ -12,4 +12,4 @@ pkgtype=deb
 
 PKGURL=$(eget --list --latest https://github.com/jgraph/drawio-desktop/releases "drawio-$arch-$VERSION.$pkgtype") || fatal "Can't get package URL"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/duckstation.sh

@@ -17,4 +17,4 @@ SELECTOR="preview"
 
 PKGURL=$(eget --list https://github.com/stenzek/duckstation/releases $file | grep "/$SELECTOR/") || fatal "Can't get package URL"
 
-epm pack --install "$PKGNAME" "$PKGURL"
+install_pack_pkgurl

play.d/duplicati.sh

@@ -12,10 +12,7 @@ warn_version_is_not_supported
 
 pkgtype="$(epm print info -p)"
 
-# we have workaround for their postinstall script, so always repack rpm package
-[ "$pkgtype" = "deb" ] || repack='--repack'
-
 #PKG=$(eget --list --latest https://www.duplicati.com/download "duplicati-*$pkgtype") || fatal "Can't get package URL"
 PKGURL="$(eget -O /dev/stdout https://updates.duplicati.com/beta/latest-installers.js | grep -i -o -E '"url": "(.+)"' | cut -d'"' -f4 | grep "duplicati.*$pkgtype")"
 
-epm install $repack "$PKGURL"
+install_pkgurl

play.d/eagle.sh

@@ -13,20 +13,9 @@ VERSION=9.6.2
 PKGURL="https://trial2.autodesk.com/NET17SWDLD/2017/EGLPRM/ESD/Autodesk_EAGLE_${VERSION}_English_Linux_64bit.tar.gz"
 IPFSURL="ipfs://Qmd38jJnTnUMUeJuKSDBGesqXF3SxEahUVZc6NUPyMKgj1?filename=Autodesk_EAGLE_9.6.2_English_Linux_64bit.tar.gz"
 
-# use temp dir
-PKGDIR="$(mktemp -d)"
-trap "rm -fr $PKGDIR" EXIT
-cd $PKGDIR || fatal
-
 if ! eget --check-site $PKGURL ; then
     echo "It is possible you are blocked from USA, trying via IPFS ..."
     PKGURL="$IPFSURL"
 fi
 
-epm install --repack $PKGURL || exit
-
-echo
-echo "
-Run via
-$ eagle
-"
+install_pkgurl

play.d/edge.sh

@@ -8,4 +8,6 @@ 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}-[12]_amd64.deb"
+PKGURL="https://packages.microsoft.com/repos/edge/pool/main/m/$PKGNAME/${PKGNAME}_${VERSION}-[12]_amd64.deb"
+
+install_pkgurl

play.d/element-desktop.sh

@@ -16,4 +16,4 @@ arch="amd64"
 mask="$(epm print constructname $PKGNAME "$VERSION" $arch "deb")"
 PKGURL=$(eget --list --latest https://packages.element.io/debian/pool/main/e/element-desktop/index.html "$mask") || fatal "Can't get package URL"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/epson-printer-utility.sh

@@ -24,10 +24,7 @@ case "$pkgtype-$arch" in
         ;;
 esac
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm install $repack "$PKGURL" || exit
+install_pkgurl
 
 echo
 echo "Note: run

play.d/epsonscan2-non-free-plugin.sh

@@ -24,7 +24,4 @@ case "$pkgtype-$arch" in
         ;;
 esac
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm pack $repack --install $PKGNAME "$PKGURL"
+install_pack_pkgurl

play.d/epsonscan2.sh

@@ -24,7 +24,4 @@ case "$pkgtype-$arch" in
         ;;
 esac
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm pack $repack --install $PKGNAME "$PKGURL"
+install_pack_pkgurl

play.d/express-client.sh

@@ -12,4 +12,4 @@ warn_version_is_not_supported
 
 PKGURL="https://express.ms/download/deb"
 
-epm install $PKGURL
+install_pkgurl

play.d/far2l-portable.sh

@@ -12,4 +12,4 @@ warn_version_is_not_supported
 PKGURL=$(eget --list --latest https://github.com/spvkgn/far2l-portable/releases "far2l_x86_64.AppImage.tar")
 [ -n "$PKGURL" ] || fatal "Can't get package URL"
 
-epm --install pack $PKGNAME "$PKGURL"
+install_pack_pkgurl

play.d/figma.sh

@@ -27,8 +27,5 @@ esac
 
 PKGURL=$(eget --list --latest https://github.com/Figma-Linux/figma-linux/releases "$file") || fatal "Can't get package URL"
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm install $repack "$PKGURL" || exit
+install_pkgurl
 

play.d/firefox-nightly.sh

@@ -14,4 +14,4 @@ arch=x86_64
 VERSION="*"
 PKGURL="https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-$VERSION.en-US.linux-$arch.deb"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/flashplayer.sh

@@ -13,4 +13,4 @@ warn_version_is_not_supported
 VERSION=32.0.0.465
 PKGURL="https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"
 
-epm pack --install $PKGNAME $PKGURL "$VERSION"
+install_pack_pkgurl "$VERSION"

play.d/flyview-client.sh

@@ -12,4 +12,4 @@ warn_version_is_not_supported
 #PKG="$(eget --list --latest https://flyviewvms.ru/downloads/ "flyview-client*linux64.deb")"
 PKGURL="https://flyviewvms.ru/distro/flyview-client.deb"
 
-epm install $PKGURL
+install_pkgurl

play.d/flyview-server.sh

@@ -12,7 +12,7 @@ warn_version_is_not_supported
 #PKG="$(eget --list --latest https://flyviewvms.ru/downloads/ "flyview-server*linux64.deb")"
 PKGURL="https://flyviewvms.ru/distro/flyview-server.deb"
 
-epm install $PKGURL || exit
+install_pkgurl
 
 echo
 echo "

play.d/freeoffice.sh

@@ -20,7 +20,4 @@ esac
 
 PKGURL="$(eget --list --latest https://www.freeoffice.com/ru/download/applications "$file")" || fatal "Can't get package URL"
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm install $repack "$PKGURL"
+install_pkgurl

play.d/freeplane.sh

@@ -11,4 +11,4 @@ URL="http://freeplane.sourceforge.net"
 [ "$VERSION" = "*" ] && VERSION="$(eget -O- https://sourceforge.net/projects/$PKGNAME/best_release.json | sed -e 's|.*freeplane_bin-||g' -e 's|\.zip.*||')"
 
 PKGURL="https://download.sourceforge.net/project/freeplane/freeplane%20stable/freeplane_$VERSION~upstream-1_all.deb"
-epm install "$PKGURL"
+install_pkgurl

play.d/geogebra.sh

@@ -20,15 +20,12 @@ esac
 
 pkgtype="$(epm print info -p)"
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
 case $pkgtype in
     #deb)
     #    epm install "https://www.geogebra.net/linux/pool/main/g/geogebra-classic/$(epm print constructname $PKGNAME "$VERSION" $arch)"
     #    ;;
     rpm)
-        #epm $repack install "https://www.geogebra.net/linux/rpm/$arch/$(epm print constructname $PKGNAME "$VERSION" $arch)"
+        #PKGURL="https://www.geogebra.net/linux/rpm/$arch/$(epm print constructname $PKGNAME "$VERSION" $arch)"
         #http://www.geogebra.net/linux/rpm/x86_64/geogebra-classic-6.0.666.0-202109211234.x86_64.rpm
         PKGURL="ipfs://Qmc6KzDcverDKJptZd6ffJMqyYbKKcuwdHitB6EAEw2C6n?filename=geogebra-classic-6.0.666.0-202109211234.x86_64.rpm"
         ;;
@@ -37,4 +34,4 @@ case $pkgtype in
         ;;
 esac
 
-epm $repack install "$PKGURL"
+install_pkgurl

play.d/gitkraken.sh

@@ -20,8 +20,4 @@ case $pkgtype in
         ;;
 esac
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    repack="--repack"
-fi
-
-epm install $repack "$PKGURL"
+install_pkgurl

play.d/gitlab-runner.sh

@@ -25,13 +25,8 @@ case "$arch" in
         ;;
 esac
 
-repack=''
-case $(epm print info -e) in
-    ALTLinux/*)
-        repack='--repack'
-        ;;
-esac
-
 # https://docs.gitlab.com/runner/install/linux-manually.html
 # https://gitlab-runner-downloads.s3.amazonaws.com/latest/index.html
-epm install $repack "https://gitlab-runner-downloads.s3.amazonaws.com/latest/$pkg/gitlab-runner_${arch}.$pkg"
+PKGURL="https://gitlab-runner-downloads.s3.amazonaws.com/latest/$pkg/gitlab-runner_${arch}.$pkg"
+
+install_pkgurl

play.d/guardant.sh

@@ -30,10 +30,7 @@ esac
 
 PKGURL=$(eget --list --latest https://download.guardant.ru/LM/Linux/$VERSION/$shortarch/ "$file") || fatal "Can't get package URL"
 
-repack=''
-[ "$pkgtype" = "rpm" ] && repack='--repack'
-
-epm pack $PKGNAME $repack --install "$PKGURL" "$VERSION" || exit
+install_pack_pkgurl "$VERSION"
 
 cat <<EOF
 

play.d/hansoft-client.sh

@@ -15,4 +15,4 @@ VERSION="${VERSION/\./_}"
 
 PKGURL="https://cache.hansoft.com/hansoft_${VERSION}_x64.deb"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/hplip-plugin.sh

@@ -18,4 +18,4 @@ fi
 # https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-$VERSION-plugin.run
 PKGURL="https://developers.hp.com/sites/default/files/hplip-$VERSION-plugin.run"
 
-epm pack --install $PKGNAME $PKGURL
+install_pack_pkgurl

play.d/icaclient.sh

@@ -40,7 +40,4 @@ if ! eget --check-site $PKGURL ; then
     PKGURL="ipfs://$IPFSHASH?filename=$pkgname"
 fi
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm install $repack $PKGURL
+install_pkgurl

play.d/icq.sh

@@ -16,4 +16,5 @@ fi
 # TODO: install from snap
 #PKGURL="https://icq-www.hb.bizmrg.com/linux/x64/icq.tar.xz"
 PKGURL="https://hb.bizmrg.com/icq-www/linux/x64/packages/$VERSION/icq-${VERSION}_64bit.tar.xz"
-epm install --repack "$PKGURL"
+
+install_pkgurl

play.d/idea-community.sh

@@ -10,5 +10,4 @@ URL="https://www.jetbrains.com/idea/"
 
 PKGURL="$(get_jetbrains_pkgurl IIC idea)"
 
-epm install $PKGURL
-
+install_pkgurl

play.d/idea.sh

@@ -10,5 +10,5 @@ URL="https://www.jetbrains.com/idea/"
 
 PKGURL="$(get_jetbrains_pkgurl IIU idea)"
 
-epm install $PKGURL
+install_pkgurl
 

play.d/iptvnator.sh

@@ -22,4 +22,4 @@ pkgtype=deb
 
 PKGURL=$(eget --list --latest https://github.com/4gray/iptvnator/releases/ "$PKGNAME*$VERSION*$arch.$pkgtype") || fatal "Can't get package URL"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/jetbrains-toolbox.sh

@@ -12,9 +12,8 @@ warn_version_is_not_supported
 
 # https://github.com/nagygergo/jetbrains-toolbox-install/blob/master/jetbrains-toolbox.sh
 
-PKGURL=$(eget -O- "https://data.services.jetbrains.com/products?code=TBA&release.type=eap%2Crc%2Crelease&fields=distributions%2Clink%2Cname%2Creleases" | epm --inscript tool json -b | grep '0,"releases",0,"downloads","linux","link"' | sed -e 's|.*[[:space:]]||')
+# https://download.jetbrains.com/toolbox/jetbrains-toolbox-1.25.12627.tar.gz
 
-#https://download.jetbrains.com/toolbox/jetbrains-toolbox-1.25.12627.tar.gz
+PKGURL=$(eget -O- "https://data.services.jetbrains.com/products?code=TBA&release.type=eap%2Crc%2Crelease&fields=distributions%2Clink%2Cname%2Creleases" | epm --inscript tool json -b | grep '0,"releases",0,"downloads","linux","link"' | sed -e 's|.*[[:space:]]||' -e 's|"||g' )
 
-# eval for drop quotes
-eval epm pack --install $PKGNAME $PKGURL
+install_pack_pkgurl

play.d/joplin.sh

@@ -10,4 +10,4 @@ URL="https://joplinapp.org/"
 
 PKGURL="$(eget --list --latest https://github.com/laurent22/joplin/releases/ "Joplin-$VERSION.AppImage")"
 
-epm install $PKGURL
+install_pkgurl

play.d/k3s.sh

@@ -33,4 +33,5 @@ else
 fi
 
 VERSION="$(echo "$PKGURL" | sed -e 's|.*download/v||' -e 's|%2Bk3s1.*||' -e 's|+k3s1.*||' -e 's|-.*||')"
-epm pack --install $PKGNAME "$PKGURL" $VERSION
+
+install_pack_pkgurl $VERSION

play.d/ktalk.sh

@@ -14,4 +14,6 @@ PKGURL="https://app.ktalk.ru/system/dist/download/linux"
 
 # curl can't get filename: https://github.com/curl/curl/issues/8461
 epm assure wget || fatal
-EGET_BACKEND=wget epm pack --install $PKGNAME $PKGURL
+export EGET_BACKEND=wget
+
+install_pack_pkgurl

play.d/kubo.sh

@@ -39,4 +39,5 @@ esac
 
 
 PKGURL="$(eget --list --latest https://github.com/ipfs/kubo/releases "${BASEPKGNAME}_v${VERSION}$file")"
-epm pack --install $PKGNAME "$PKGURL"
+
+install_pack_pkgurl

play.d/kyocera-sane.sh

@@ -12,4 +12,4 @@ warn_version_is_not_supported
 
 PKGURL="https://www.kyoceradocumentsolutions.de/content/download-center/de/drivers/all/SANE_Driver_zip.download.zip"
 
-epm pack --install $PKGNAME "$PKGURL"
+install_pack_pkgurl

play.d/kyodialog.sh

@@ -12,4 +12,4 @@ warn_version_is_not_supported
 
 PKGURL="https://www.kyoceradocumentsolutions.eu/content/download-center/eu/drivers/all/Linux_Universal_Driver_zip.download.zip"
 
-epm pack --install kyodialog "$PKGURL"
+install_pack_pkgurl

play.d/librewolf.sh

@@ -27,7 +27,4 @@ if ! is_glibc_enough 2.35 ; then
     PKGURL="https://deb.librewolf.net/pool/focal/librewolf-$VERSION-[0-9].$arch.deb"
 fi
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm install $repack "$PKGURL"
+install_pkgurl

play.d/liteide.sh

@@ -11,6 +11,5 @@ URL="https://github.com/visualfc/liteide"
 archbit="$(epm print info -b)"
 
 PKGURL=$(eget --list --latest https://github.com/visualfc/liteide/releases "liteidex$VERSION.linux$archbit-qt5*-system.tar.gz") #"
-[ -n "$PKGURL" ] || fatal "Can't get package URL"
 
-epm pack --install $PKGNAME "$PKGURL"
+install_pack_pkgurl

play.d/lithium.sh

@@ -27,14 +27,8 @@ case $pkgtype in
         ;;
 esac
 
-repack=''
-case $(epm print info -s) in
-    alt)
-        repack="--repack"
-esac
-
 # https://www.lecad.ru/?download=&kcccount=https://www.lecad.ru/wp-content/uploads/lithium-ecad_1.7.5_amd64.deb
 # https://www.lecad.ru/?download=&kcccount=https://www.lecad.ru/wp-content/uploads/lithium_ecad-1.7.5-0.x86_64.rpm
 PKGURL="$(eget --list --latest https://www.lecad.ru/actual-version/ "$mask")"
 
-epm $repack install "$PKGURL"
+install_pkgurl

play.d/logseq.sh

@@ -11,4 +11,4 @@ URL="https://github.com/logseq/logseq"
 # https://github.com/logseq/logseq/releases/download/0.9.5/Logseq-linux-x64-0.9.5.AppImage
 PKGURL=$(eget --list https://github.com/logseq/logseq/releases/ "Logseq-linux-x64-$VERSION.AppImage" | grep -v nightly | head -n1) || fatal "Can't get package URL"
 
-epm pack --install $PKGNAME "$PKGURL"
+install_pack_pkgurl

play.d/lunacy.sh

@@ -31,4 +31,4 @@ fi
 # https://icons8.ru/lunacy
 PKGURL="https://lcdn.icons8.com/setup/$file"
 
-epm install $PKGURL
+install_pkgurl

play.d/lycheeslicer.sh

@@ -33,4 +33,4 @@ if ! eget --check-url "$PKGURL" ; then
     fi
 fi
 
-epm install $PKGURL
+install_pkgurl

play.d/mailruagent.sh

@@ -17,7 +17,7 @@ if [ "$VERSION" = "*" ] ; then
 fi
 
 PKGURL="https://hb.bizmrg.com/agent-www/linux/x64/agent.tar.xz"
-epm pack --install $PKGNAME "$PKGURL" $VERSION
+install_pack_pkgurl "$VERSION"
 
 #PKGURL="$(eget -O- -H Snap-Device-Series:16 https://api.snapcraft.io/v2/snaps/info/agent | epm --inscript tool json -b | grep '\["channel-map",0,"download","url"\]' | head -n1 | sed -e 's|.*"\(.*\)"$|\1|' )" || fatal "Can't get URL"
 

play.d/mailspring.sh

@@ -15,4 +15,4 @@ pkgtype=deb
 
 PKGURL=$(eget --list --latest https://github.com/Foundry376/Mailspring/releases/ "$PKGNAME*$VERSION*$arch.$pkgtype") || fatal "Can't get package URL"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/master-pdf-editor.sh

@@ -9,7 +9,6 @@ URL="https://master-pdf-editor.ru/"
 . $(dirname $0)/common.sh
 
 PKG=''
-repack=''
 # Strict supported list
 case $(epm print info -e) in
     AstraLinuxCE/*|Debian/9|Ubuntu/18)
@@ -20,14 +19,12 @@ case $(epm print info -e) in
         ;;
     RedOS/*|AlterOS/*|ALTLinux/*|CentOS/*|RockyLinux/*)
         PKG="master-pdf-editor-$VERSION-qt5.x86_64.rpm"
-        repack='--repack'
         ;;
 esac
 
 if [ -z "$PKG" ] ; then
     case $(epm print info -p) in
         rpm)
-            repack='--repack'
             PKG="master-pdf-editor-$VERSION-qt5.x86_64.rpm"
             ;;
         *)
@@ -38,4 +35,4 @@ fi
 
 PKGURL=$(eget --list --latest https://code-industry.ru/get-master-pdf-editor-for-linux/ "$PKG") || fatal "Can't get package URL"
 
-epm $repack install "$PKGURL"
+install_pkgurl

play.d/mattermost-desktop.sh

@@ -23,5 +23,5 @@ esac
 
 PKGURL=$(eget --list --latest https://github.com/mattermost/desktop/releases $(epm print constructname $PKGNAME "$VERSION*" $arch "deb")) || fatal "Can't get package URL"
 
-epm install --repack "$PKGURL"
+install_pkgurl
 

play.d/meridius.sh

@@ -14,4 +14,4 @@ else
     PKGURL=$(eget --list --latest https://github.com/PurpleHorrorRus/Meridius/releases "$PKGNAME-*.tar.gz") || fatal "Can't get package URL"
 fi
 
-epm install "$PKGURL"
+install_pkgurl

play.d/minecraft-launcher.sh

@@ -11,5 +11,6 @@ URL="https://www.minecraft.net/en-us/download"
 warn_version_is_not_supported
 
 # https://www.minecraft.net/en-us/download
-epm install "https://launcher.mojang.com/download/Minecraft.deb"
+PKGURL="https://launcher.mojang.com/download/Minecraft.deb"
 
+install_pkgurl

play.d/mobirise.sh

@@ -12,4 +12,4 @@ warn_version_is_not_supported
 
 PKGURL="https://download.mobirise.com/MobiriseSetup.deb"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/mytonwallet.sh

@@ -10,4 +10,4 @@ URL="https://mytonwallet.app/"
 
 PKGURL=$(eget --list --latest https://github.com/mytonwalletorg/mytonwallet/releases "MyTonWallet-x86_64.AppImage") || fatal "Can't get package URL"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/neovide.sh

@@ -10,5 +10,5 @@ URL="https://neovide.dev/"
 
 PKGURL=$(eget --list --latest https://github.com/neovide/neovide/releases "$PKGNAME.AppImage") || fatal "Can't get package URL"
 
-epm install "$PKGURL"
+install_pkgurl
 

play.d/netbeans.sh

@@ -26,4 +26,5 @@ esac
 
 # epm install "https://dlcdn.apache.org/netbeans/netbeans-installers/$VERSION/$mask"
 PKGURL="https://archive.apache.org/dist/netbeans/netbeans-installers/$VERSION/$mask"
-epm install "$PKGURL"
+
+install_pkgurl

play.d/novelwriter.sh

@@ -17,4 +17,4 @@ pkgtype=deb
 # 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"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/nwjs-ffmpeg-prebuilt.sh

@@ -11,4 +11,4 @@ URL="https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt/"
 # https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt/releases/download/0.85.0/0.85.0-linux-x64.zip
 PKGURL=$(eget --list --latest https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt/releases "${VERSION}-linux-x64.zip") || fatal "Can't get package URL"
 
-epm pack --install $PKGNAME $PKGURL
+install_pack_pkgurl

play.d/obsidian.sh

@@ -13,4 +13,4 @@ pkgtype=deb
 
 PKGURL=$(eget --list --latest https://github.com/obsidianmd/obsidian-releases/releases/ "$PKGNAME*$VERSION*$arch.$pkgtype") || fatal "Can't get package URL"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/onlyoffice.sh

@@ -44,5 +44,4 @@ fi
 #PKGURL="https://download.onlyoffice.com/install/desktop/editors/linux/"
 #PKGURL="$(eget --list --latest https://github.com/ONLYOFFICE/DesktopEditors/releases $(epm print constructname $PKGNAME "$VERSION" $arch $pkgtype))"
 
-# use --repack to apply repack script for all platforms
-epm install --repack "$PKGURL"
+install_pkgurl

play.d/opera.sh

@@ -18,11 +18,9 @@ if [ "$(epm print info -p)" = "rpm" ] ; then
     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"
-    epm install $repack "$PKGURL"
-    exit
+else
+    PKGURL="https://deb.opera.com/opera-developer/pool/non-free/o/$PKGNAME/$(epm print constructname $PKGNAME "$VERSION" $arch deb)"
 fi
 
-PKGURL="https://deb.opera.com/opera-developer/pool/non-free/o/$PKGNAME/$(epm print constructname $PKGNAME "$VERSION" $arch deb)"
-epm install "$PKGURL"
+install_pkgurl

play.d/pachca.sh

@@ -13,5 +13,5 @@ file="${PKGNAME}_${VERSION}_$arch.deb"
 
 PKGURL=$(eget --list --latest https://github.com/pachca/pachca-desktop/releases "$file") || fatal "Can't get package URL"
 
-epm install "$PKGURL"
+install_pkgurl
 

play.d/packet-tracer.sh

@@ -20,4 +20,4 @@ case $VERSION in
         ;;
 esac
 
-epm install $PKGURL
+install_pkgurl

play.d/pantum.sh

@@ -36,7 +36,7 @@ case $(epm print info -e) in
 #        ;;
 esac
 
-epm pack --install $PKGNAME "$PKGURL" || exit
+install_pack_pkgurl
 
 #PKGURL="https://drivers.pantum.ru/userfiles/files/download/%E9%A9%B1%E5%8A%A8%E6%96%87%E4%BB%B6/%E6%A0%87%E7%AD%BE%E6%9C%BA/Linux/linux_pantum.7z"
 

play.d/pcsx2.sh

@@ -13,4 +13,4 @@ file="pcsx2-v${VERSION}-linux-appimage-x64-Qt.AppImage"
 
 PKGURL=$(eget --list --latest https://github.com/PCSX2/pcsx2/releases "$file") || fatal "Can't get package URL"
 
-epm pack --install "$PKGNAME" "$PKGURL"
+install_pack_pkgurl

play.d/pencil.sh

@@ -21,10 +21,6 @@ case $arch in
         fatal "Unsupported arch $arch for $(epm print info -d)"
 esac
 
-# we have workaround for their postinstall script, so always repack rpm package
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
 # current links:
 # https://pencil.evolus.vn/dl/V3.1.1.ga/Pencil-3.1.1.ga.x86_64.rpm
 # https://pencil.evolus.vn/dl/V3.1.1.ga/Pencil-3.1.1.ga.i686.rpm
@@ -34,4 +30,5 @@ repack=''
 mask="$(epm print constructname $PKGNAME "$VERSION.ga" $arch)"
 
 PKGURL="$(eget --list --latest https://pencil.evolus.vn/Downloads.html "$mask")" || fatal "Can't get package URL"
-epm $repack install "$PKGURL"
+
+install_pkgurl

play.d/pfusp.sh

@@ -9,9 +9,10 @@ URL="https://www.pfu.ricoh.com/global/scanners/fi/dl/agree/ubuntu-64-221-sp.html
 . $(dirname $0)/common.sh
 
 warn_version_is_not_supported
+
 VERSION=2.2.1
 
 # check URL to upgrade the version
 PKGURL="https://origin.pfultd.com/downloads/IMAGE/driver/ubuntu/221/pfusp-ubuntu_2.2.1_amd64.deb"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/pgadmin4.sh

@@ -22,8 +22,7 @@ fi
 BASEURL=https://ftp.postgresql.org/pub/pgadmin/pgadmin4/yum/redhat/rhel-8Workstation-x86_64
 #BASEURL=https://ftp.postgresql.org/pub/pgadmin/pgadmin4/yum/fedora/fedora-38Workstation-x86_64
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
 pkgarch='x86_64'
-epm $repack install $BASEURL/pgadmin4-server-$VERSION.*.$pkgarch.rpm $BASEURL/pgadmin4-desktop-$VERSION.*.$pkgarch.rpm
+PKGURL="$BASEURL/pgadmin4-server-$VERSION.*.$pkgarch.rpm $BASEURL/pgadmin4-desktop-$VERSION.*.$pkgarch.rpm"
+
+install_pkgurl

play.d/phpstorm.sh

@@ -10,4 +10,4 @@ URL="https://www.jetbrains.com/phpstorm/"
 
 PKGURL="$(get_jetbrains_pkgurl PS webide)"
 
-epm install $PKGURL
+install_pkgurl

play.d/plex-desktop.sh

@@ -11,4 +11,4 @@ URL="https://www.plex.tv/"
 # https://api.snapcraft.io/api/v1/snaps/download/qc6MFRM433ZhI1XjVzErdHivhSOhlpf0_37.snap
 PKGURL="$(eget -O- -H Snap-Device-Series:16 https://api.snapcraft.io/v2/snaps/info/plex-desktop | epm --inscript tool json -b | grep '\["channel-map",0,"download","url"\]' | head -n1 | sed -e 's|.*"\(.*\)"$|\1|' )" || fatal "Can't get URL"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/portmaster.sh

@@ -10,7 +10,6 @@ URL="https://safing.io/"
 
 warn_version_is_not_supported
 
-repack=''
 pkgtype="$(epm print info -p)"
 
 case "$pkgtype" in
@@ -21,10 +20,6 @@ case "$pkgtype" in
         ;;
 esac
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    repack="--repack"
-fi
-
 PKGURL="https://updates.safing.io/latest/linux_amd64/packages/portmaster-installer.$pkgtype"
 
-epm install $repack "$PKGURL"
+install_pkgurl

play.d/portproton.sh

@@ -7,19 +7,14 @@ DESCRIPTION='PortProton (from the repository if the package is there, or from th
 
 . $(dirname $0)/common.sh
 
-res=0
 if ! epm install portproton ; then
     PKGURL="$(eget --list --latest https://github.com/Castro-Fidel/PortProton_dpkg/releases "portproton_${VERSION}amd64.deb")"
-    epm install $PKGURL
-    res=$?
+    install_pkgurl
 fi
 
-
 # TODO: get from  grep '^###Scripts version ' PortWINE/data_from_portwine/changelog_eng | head -n1
 ###Scripts version 2172###
 #VERSION="$(eget -O- https://api.github.com/repos/Castro-Fidel/PortWINE/commits/HEAD | grep '"message": "Scripts version' | sed -e 's|.*Scripts version ||' -e 's|".*||' )"
 #epm pack --install $PKGNAME https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz $VERSION
 
 epm play i586-fix
-
-exit $res

play.d/postman.sh

@@ -19,4 +19,4 @@ esac
 
 PKGURL="https://dl.pstmn.io/download/latest/linux_$arch"
 
-epm pack --install $PKGNAME "$PKGURL"
+install_pack_pkgurl

play.d/powershell.sh

@@ -28,8 +28,4 @@ esac
 
 PKGURL=$(eget --list --latest $BASEURL "$file") || fatal "Can't get package URL"
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
-epm install $repack "$PKGURL" || exit
-
+install_pkgurl

play.d/pstube.sh

@@ -26,8 +26,4 @@ arch=x86_64
 # https://github.com/prateekmedia/pstube/releases/download/2.6.0/pstube-linux-2.6.0-x86_64.deb
 PKGURL=$(eget --list --latest https://github.com/prateekmedia/pstube/releases "$PKGNAME-$VERSION-$arch.$pkgtype") || fatal "Can't get package URL"
 
-# we have workaround for their postinstall script, so always repack rpm package
-[ "$pkgtype" = "deb" ] || repack='--repack'
-
-epm install $repack "$PKGURL" || exit
-
+install_pkgurl

play.d/pycharm-pro.sh

@@ -10,4 +10,4 @@ URL="https://www.jetbrains.com/ru-ru/pycharm/"
 
 PKGURL="$(get_jetbrains_pkgurl PCP python)"
 
-epm install "$PKGURL"
+install_pkgurl

play.d/pycharm.sh

@@ -10,4 +10,4 @@ URL="https://www.jetbrains.com/ru-ru/pycharm/"
 
 PKGURL="$(get_jetbrains_pkgurl PCC python)"
 
-epm install $PKGURL
+install_pkgurl

play.d/realvnc-server.sh

@@ -16,9 +16,6 @@ fi
 pkgtype="$(epm print info -p)"
 arch="$(epm print info -a)"
 
-repack=''
-[ "$(epm print info -s)" = "alt" ] && repack='--repack'
-
 case $pkgtype-$arch in
     rpm-x86_64)
         mask="VNC-Server-$VERSION-Linux-x64.rpm"
@@ -33,4 +30,4 @@ esac
 
 PKGURL=$(eget --list --latest https://www.realvnc.com/en/connect/download/vnc/ "$mask") || fatal "Can't get package URL"
 
-epm $repack install $PKGURL
+install_pkgurl