epm play vivaldi: use pack for vivaldi-codecs-ffmpeg-extra

pack.d/vivaldi-snapshot-codecs-ffmpeg-extra.sh

+vivaldi-stable-codecs-ffmpeg-extra.sh
\ No newline at end of file

play.d/vivaldi-codecs-ffmpeg-extra.sh → pack.d/vivaldi-stable-codecs-ffmpeg-extra.sh

-#!/bin/sh
+#!/bin/sh -x
 
-BRANCH=stable
-PRODUCTDIR=/opt/vivaldi
-DESCRIPTION=''
+UPDATEFFMPEG="$1"
+RETURNTARNAME="$2"
 
-if [ "$2" = "snapshot" ] || epm installed vivaldi-snapshot-codecs-ffmpeg-extra ; then
-    BRANCH=snapshot
-    PRODUCTDIR=$PRODUCTDIR-$BRANCH
-fi
+. $(dirname $0)/common.sh
 
-BASEPKGNAME=vivaldi-$BRANCH
-PRODUCTALT="stable snapshot"
-PKGNAME=vivaldi-$BRANCH-codecs-ffmpeg-extra
-SUPPORTEDARCHES="x86_64"
+[ -x "$UPDATEFFMPEG" ] || fatal "$UPDATEFFMPEG is missed"
 
-. $(dirname $0)/common.sh
+CURDIR=$(pwd)
+PRODUCTDIR="$(dirname $UPDATEFFMPEG)"
+BASEPKGNAME=vivaldi-stable
+
+PKGNAME=$(basename $0 .sh)
+if echo "$PKGNAME" | grep -q "vivaldi-snapshot" ; then
+    BASEPKGNAME=vivaldi-snapshot
+fi
 
 VIVALDI_VERSION=$(epm print version for package $BASEPKGNAME) || fatal
 
+# used in update-ffmpeg
 epm install --skip-installed tar binutils || exit
 epm assure awk gawk || exit
 
@@ -27,19 +28,18 @@ pack_ffmpeg() {
   DEST="$PRODUCTDIR"
   mkdir -p .$DEST
   cp $SOURCE .$DEST/libffmpeg.so.${VIVALDI_VERSION%\.*\.*}
-  CNAME="$(echo "$(basename $SUITABLE_URLS)" | sed -e "s|chromium|$BASEPKGNAME|" -e "s|-0ubuntu.*|-1.tar|")" #"
+  CNAME=$CURDIR/"$(echo "$(basename $SUITABLE_URLS)" | sed -e "s|chromium|$BASEPKGNAME|" -e "s|-0ubuntu.*|-1.tar|")" #"
   a='' tar cf $CNAME .$(dirname $DEST)
-  epm --repack install $CNAME
+  return_tar $CNAME
+  exit
 }
 
-# download ffmpeg with upstream script update-ffmpeg but with our pack_ffmpeg function
-[ -s $PRODUCTDIR/update-ffmpeg ] || fatal "$PRODUCTDIR/update-ffmpeg is missed"
 
 SC=$(mktemp)
 DDIR=$(mktemp -d)
 trap "rm -fr $SC $DDIR" EXIT
 
-a='' awk 'BEGIN{desk=0}{ if(/^.*--system.*/&&desk==0){desk++} ; if (desk==0) {print} }' < $PRODUCTDIR/update-ffmpeg > $SC
+a='' awk 'BEGIN{desk=0}{ if(/^.*--system.*/&&desk==0){desk++} ; if (desk==0) {print} }' < $UPDATEFFMPEG > $SC
 . $SC
 cd $DDIR || fatal
 epm tool eget $FFMPEG_URL_DEB || exit

play.d/vivaldi.sh

@@ -38,11 +38,12 @@ if [ "$BRANCH" = "snapshot" ] ; then
     # https://help.vivaldi.com/desktop/install-update/install-snapshots-on-non-deb-rpm-distros/
     DEBARCH=$arch
     VIVALDI_STREAM=vivaldi-snapshot
-    VIVALDI_VERSION=$(epm tool eget -O- "https://repo.vivaldi.com/archive/deb/dists/stable/main/binary-$DEBARCH/Packages.gz" | gzip -d | grep -A6 -x "Package: $VIVALDI_STREAM" | sed -n 's/^Version: \(\([0-9]\+\.\)\{3\}[0-9]\+-[0-9]\+\)/\1/p' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -n 1) #"
+    VIVALDI_VERSION=$(epm tool eget -O- "https://repo.vivaldi.com/archive/deb/dists/stable/main/binary-$DEBARCH/Packages.gz" | gzip -d | grep -A6 -x "Package: $VIVALDI_STREAM" | sed -n 's/^Version: \(\([0-9]\+\.\)\{3\}[0-9]\+-[0-9]\+\)/\1/p' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -n 1) #'
     PKGURL="https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_${VIVALDI_VERSION}_$arch.deb"
 else
-    PKGURL="$(epm tool eget --list --latest https://vivaldi.com/ru/download "$(epm print constructname $PKGNAME "*" $arch deb)")" || fatal
+    PKGURL="$(epm tool eget --list --latest https://vivaldi.com/ru/download "$(epm print constructname $PKGNAME "*" $arch deb)")" #" || fatal
 fi
 epm install $PKGURL || fatal
 
-epm play vivaldi-codecs-ffmpeg-extra $BRANCH
+UPDATEFFMPEG=$(epm ql $PKGNAME | grep update-ffmpeg) || fatal
+epm pack --install $PKGNAME-codecs-ffmpeg-extra $UPDATEFFMPEG