epm play yandex-browser: install codecs directly via epm pack

pack.d/yandex-browser-stable-codecs-ffmpeg-extra.sh

@@ -5,8 +5,10 @@ RETURNTARNAME="$2"
 
 . $(dirname $0)/common.sh
 
-CURDIR=$(pwd)
-PRODUCTDIR="$(dirname $UPDATEFFMPEG)"
+[ -x "$UPDATEFFMPEG" ] || fatal "$UPDATEFFMPEG is missed"
+
+CURDIR="$(pwd)"
+PRODUCTDIR="$(dirname "$UPDATEFFMPEG")"
 BASEPKGNAME=yandex-browser-stable
 
 PKGNAME=$(basename $0 .sh)
@@ -34,7 +36,6 @@ URL="https://browser-resources.s3.yandex.net/linux/codecs.json"
 update_url_if_need_mirrored
 
 # download ffmpeg with upstream script update-ffmpeg but with our pack_ffmpeg function
-[ -x $UPDATEFFMPEG ] || fatal "$UPDATEFFMPEG is missed"
 SC=$(mktemp)
 trap "rm -f $SC" EXIT
 sed -e 's|install_ffmpeg &&|pack_ffmpeg \&\&|' \

play.d/yandex-browser-codecs-ffmpeg-extra.sh

-#!/bin/sh
-
-SUPPORTEDARCHES="x86_64"
-PRODUCTALT="stable beta"
-DESCRIPTION=''
-
-BRANCH=stable
-if [ "$2" = "beta" ] || epm installed yandex-browser-beta-codecs-ffmpeg-extra ; then
-    BRANCH=beta
-fi
-
-BASEPKGNAME=yandex-browser-$BRANCH
-PKGNAME=$BASEPKGNAME-codecs-ffmpeg-extra
-
-. $(dirname $0)/common.sh
-
-epm pack --install $PKGNAME

play.d/yandex-browser.sh

@@ -4,6 +4,7 @@ DESCRIPTION="Yandex browser from the official site"
 TIPS="Run 'epm play yandex-browser=beta' to install beta version of the browser."
 
 PRODUCTALT="stable beta"
+
 BRANCH=stable
 if [ "$2" = "beta" ] || epm installed yandex-browser-beta ; then
     BRANCH=beta
@@ -37,4 +38,5 @@ else
     epm install "$URL/rpm/stable/x86_64/$(epm print constructname $PKGNAME "*" x86_64 rpm)" || exit
 fi
 
-epm play yandex-browser-codecs-ffmpeg-extra $BRANCH
+UPDATEFFMPEG=$(epm ql $PKGNAME | grep update-ffmpeg) || fatal
+epm pack --install $PKGNAME-codecs-ffmpeg-extra $UPDATEFFMPEG