epm play telegram: move repacking to pack.d

pack.d/Telegram-beta.sh

+Telegram.sh
\ No newline at end of file

pack.d/Telegram.sh

+#!/bin/sh
+
+TAR="$1"
+#VERSION="$2"
+RETURNTARNAME="$2"
+PRODUCT="$(basename $0 .sh)"
+
+. $(dirname $0)/common.sh
+
+CURDIR="$(pwd)"
+
+PKGDIR="$(mktemp -d)"
+trap "rm -fr $PKGDIR" EXIT
+cd $PKGDIR || fatal
+
+erc $TAR || fatal
+
+# use version from tarball
+# (TODO: get basename via erc
+PKGNAME="$(basename $TAR .tar.xz | sed -e "s|^tsetup|$PRODUCT|" )"
+#PKGNAME="$(basename $PKGNAME .zip | )"
+
+f=$PRODUCT
+[ -f "$PRODUCT/$PRODUCT" ] && f="$PRODUCT/$PRODUCT"
+
+mkdir -p opt/$PRODUCT || fatal
+cp $f opt/$PRODUCT || fatal
+erc pack $CURDIR/$PKGNAME.tar opt/$PRODUCT
+
+return_tar $PKGNAME.tar

play.d/telegram.sh

@@ -20,9 +20,5 @@ VERSION=".*$BRANCH"
 
 PKGURL=$(epm tool eget --list --latest https://github.com/telegramdesktop/tdesktop/releases "tsetup.$VERSION.tar.xz") #"
 [ -n "$PKGURL" ] || fatal "Can't get package URL"
-PKGDIR=$(mktemp -d)
-trap "rm -fr $PKGDIR" EXIT
-PKGFILE=$(echo $PKGDIR/$(basename $PKGURL) | sed -e "s|/tsetup|/$PKGNAME|")
-epm tool eget -O $PKGFILE $PKGURL || exit
 
-epm install --repack "$PKGFILE"
+epm --install pack $PKGNAME "$PKGURL"

repack.d/Telegram.sh

@@ -26,13 +26,6 @@ subst "s|^License: unknown$|License: GPLv2|" $SPEC
 subst "s|^URL:.*|URL: https://desktop.telegram.org/|" $SPEC
 subst "s|^Summary:.*|Summary: Telegram Desktop messaging app|" $SPEC
 
-
-# move package to /opt
-ROOTDIR=$(basename $(find $BUILDROOT -mindepth 1 -maxdepth 1 -type d))
-mkdir $BUILDROOT/opt
-mv $BUILDROOT/$ROOTDIR $BUILDROOT$PRODUCTDIR
-subst "s|\"/$ROOTDIR/|\"$PRODUCTDIR/|" $SPEC
-
 add_bin_link_command
 add_bin_link_command $PRODUCTCUR $PRODUCT
 
@@ -51,8 +44,9 @@ done
 mkdir -p "$BUILDROOT/etc/tdesktop"
 # telegram checks with real path to the binary
 echo "$PRODUCTDIR/$PRODUCT" >"$BUILDROOT/etc/tdesktop/externalupdater"
+pack_dir /etc/tdesktop
 pack_file /etc/tdesktop/externalupdater
-remove_file /opt/Telegram/Updater
+#remove_file /opt/Telegram/Updater
 
 # fixed above
 # Hack against https://bugzilla.altlinux.org/42402