epm play: add support for opera beta and opera developer

play.d/opera.sh

@@ -2,7 +2,17 @@
 
 DESCRIPTION="Opera browser from the official site"
 
-PKGNAME=opera-stable
+PRODUCTALT="stable beta developer"
+
+BRANCH=stable
+if [ "$2" = "beta" ] || epm installed opera-beta ; then
+    BRANCH=beta
+fi
+if [ "$2" = "developer" ] || epm installed opera-developer ; then
+    BRANCH=developer
+fi
+PKGNAME=opera-$BRANCH
+
 SUPPORTEDARCHES="x86_64"
 
 . $(dirname $0)/common.sh
@@ -11,12 +21,24 @@ arch="amd64"
 
 epm play chromium-codecs-ffmpeg-extra || fatal
 
+if [ "$BRANCH" = "stable" ] ; then
+
 # https://get.geo.opera.com/pub/${pkgname}/desktop/${pkgver}/linux/${pkgname}-stable_${pkgver}_amd64.deb
 # fast hack for download from CDN
 URL="https://download5.operacdn.com/pub/opera/desktop"
-check_url_is_accessible $URL || URL="https://download3.operacdn.com/pub/opera/desktop"
-check_url_is_accessible $URL || fatal "Can't access to Opera CDN site $URL"
+if ! check_url_is_accessible $URL ; then
+    URL="https://download3.operacdn.com/pub/opera/desktop"
+    check_url_is_accessible $URL || fatal "Can't access to Opera CDN site $URL"
+fi
 
 PKGBASEURL="$(eget --list --latest $URL/*)"linux
-PKGURL="$(epm tool eget --list --latest $PKGBASEURL "$(epm print constructname $PKGNAME "*" $arch deb)")" || fatal
+PKGURL="$(epm tool eget --list --latest $PKGBASEURL "$(epm print constructname $PKGNAME "*" $arch deb)")" || fatal #"
 epm install "$PKGURL" || fatal
+exit
+
+else
+
+[ "$($DISTRVENDOR -s)" = "alt" ] && repack='--repack' || repack=''
+epm install $repack https://rpm.opera.com/rpm/opera_$BRANCH-*-linux-release-x64-signed.rpm
+
+fi

repack.d/opera-beta.sh

+opera-stable.sh
\ No newline at end of file

repack.d/opera-developer.sh

+opera-stable.sh
\ No newline at end of file

repack.d/opera-stable.sh

@@ -4,16 +4,21 @@ BUILDROOT="$1"
 SPEC="$2"
 
 PRODUCT=opera
-PRODUCTCUR=opera
-PRODUCTDIR=/opt/opera
+PRODUCTCUR0=$(basename $0 .sh)
+PRODUCTCUR=$(basename $0 .sh)
+[ "$PRODUCTCUR" = "$PRODUCT-stable" ] && PRODUCTCUR=$PRODUCT
+PRODUCTDIR=/opt/$PRODUCTCUR
 
 . $(dirname $0)/common-chromium-browser.sh
 
-#subst '1iConflicts:vivaldi-snapshot' $SPEC
+for i in opera-stable opera-beta opera-developer ; do
+    [ "$i"  = "$PRODUCTCUR0" ] && continue
+    subst "1iConflicts:$i" $SPEC
+done
 
 set_alt_alternatives 65
 
-move_to_opt "/usr/lib/x86_64-linux-gnu/opera"
+move_to_opt "/usr/lib/*/$PRODUCTCUR" "/usr/lib*/$PRODUCTCUR"
 
 cleanup
 remove_dir /usr/share/menu
@@ -21,27 +26,32 @@ remove_dir /usr/share/lintian
 remove_dir /usr/share/mime
 remove_dir /usr/lib
 
+remove_dir /usr/lib/.build-id
 remove_file $PRODUCTDIR/opera_autoupdate.licenses
 remove_file $PRODUCTDIR/opera_autoupdate.version
 remove_file $PRODUCTDIR/opera_autoupdate
+remove_file $PRODUCTDIR/setup_repo.sh
 
-cat <<EOF >$BUILDROOT/opt/opera/resources/ffmpeg_preload_config.json
+cat <<EOF >$BUILDROOT$PRODUCTDIR/resources/ffmpeg_preload_config.json
 [
   "/opt/chromium-browser/libffmpeg.so"
 ]
 EOF
 
 # alternative way
-#mkdir -p $BUILDROOT$PRODUCTDIR/lib_extra/
-#ln -s /opt/chromium-browser/libffmpeg.so $BUILDROOT$PRODUCTDIR/lib_extra/libffmpeg.so
+mkdir -p $BUILDROOT$PRODUCTDIR/lib_extra/
+ln -s /opt/chromium-browser/libffmpeg.so $BUILDROOT$PRODUCTDIR/lib_extra/libffmpeg.so
+pack_file $PRODUCTDIR/lib_extra/libffmpeg.so
 
+#rm -fv $BUILDROOT/usr/bin/$PRODUCTCUR
 add_bin_commands
 
 fix_chrome_sandbox $PRODUCTDIR/opera_sandbox
 
+# TODO: it is possible we will not require this if link bin->/opt/dir/name is relative
 # fix to support pack links in /usr/bin (may be this is a bug?)
 epm assure patchelf || exit
-for i in $BUILDROOT/$PRODUCTDIR/$PRODUCT ; do
+for i in $BUILDROOT$PRODUCTDIR/$PRODUCTCUR ; do
     a= patchelf --set-rpath "$PRODUCTDIR/lib_extra:$PRODUCTDIR" $i
 done