epm pack: fix PRODUCT using

pack.d/64Gram.sh

@@ -2,7 +2,6 @@
 
 TAR="$1"
 RETURNTARNAME="$2"
-PRODUCT="$(basename $0 .sh)"
 FPRODUCT="Telegram"
 
 . $(dirname $0)/common.sh

pack.d/Telegram.sh

@@ -2,7 +2,6 @@
 
 TAR="$1"
 RETURNTARNAME="$2"
-PRODUCT="$(basename $0 .sh)"
 FPRODUCT="Telegram"
 TPRODUCT="Telegram"
 

pack.d/cuda-z.sh

@@ -2,7 +2,6 @@
 
 TAR="$1"
 RETURNTARNAME="$2"
-PRODUCT="cuda-z"
 
 . $(dirname $0)/common.sh
 

pack.d/far2l-portable.sh

@@ -4,6 +4,8 @@ TAR="$1"
 RETURNTARNAME="$2"
 VERSION="$3"
 
+PRODUCTCUR=far2l
+
 . $(dirname $0)/common.sh
 
 
@@ -11,9 +13,7 @@ VERSION="$3"
 
 CURDIR=$(pwd)
 
-PRODUCTNAME=far2l-portable
-PRODUCTCUR=far2l
-PKGNAME=$CURDIR/$PRODUCTNAME-$VERSION.tar
+PKGNAME=$CURDIR/$PRODUCT-$VERSION.tar
 
 tdir=$(mktemp -d)
 trap "rm -fr $tdir" EXIT
@@ -28,14 +28,14 @@ fi
 
 [ -s "$RUNFILE" ] || fatal "Missed $RUNFILE"
 
-mkdir -p $tdir/opt/$PRODUCTNAME/
+mkdir -p $tdir/opt/$PRODUCT/
 
-sh $RUNFILE --noexec --target $tdir/opt/$PRODUCTNAME || fatal
+sh $RUNFILE --noexec --target $tdir/opt/$PRODUCT || fatal
 
 #mkdir -p $tdir/usr/bin/
-#ln -s /opt/$PRODUCTNAME/$PRODUCTCUR $tdir/usr/bin/$PRODUCTCUR
+#ln -s /opt/$PRODUCT/$PRODUCTCUR $tdir/usr/bin/$PRODUCTCUR
 
-#erc pack $PKGNAME opt/$PRODUCTNAME usr/bin/ || fatal
-erc pack $PKGNAME opt/$PRODUCTNAME || fatal
+#erc pack $PKGNAME opt/$PRODUCT usr/bin/ || fatal
+erc pack $PKGNAME opt/$PRODUCT || fatal
 
 return_tar "$PKGNAME"

pack.d/jetbrains-toolbox.sh

@@ -2,7 +2,6 @@
 
 TAR="$1"
 RETURNTARNAME="$2"
-PRODUCT=jetbrains-toolbox
 
 . $(dirname $0)/common.sh
 

pack.d/portproton.sh

@@ -8,7 +8,7 @@ VERSION="$3"
 
 [ -n "$VERSION" ] || fatal "Missed archive version"
 
-PKGNAME=portproton-$VERSION.tar
+PKGNAME=$PRODUCT-$VERSION.tar
 
 erc repack "$TAR" "$PKGNAME" || fatal
 

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

@@ -11,8 +11,7 @@ CURDIR=$(pwd)
 PRODUCTDIR="$(dirname $UPDATEFFMPEG)"
 BASEPKGNAME=vivaldi-stable
 
-PKGNAME=$(basename $0 .sh)
-if echo "$PKGNAME" | grep -q "vivaldi-snapshot" ; then
+if echo "$PRODUCT" | grep -q "vivaldi-snapshot" ; then
     BASEPKGNAME=vivaldi-snapshot
 fi
 

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

@@ -11,8 +11,7 @@ CURDIR="$(pwd)"
 PRODUCTDIR="$(dirname "$UPDATEFFMPEG")"
 BASEPKGNAME=yandex-browser-stable
 
-PKGNAME=$(basename $0 .sh)
-if echo "$PKGNAME" | grep -q "yandex-browser-beta" ; then
+if echo "$PRODUCT" | grep -q "yandex-browser-beta" ; then
     BASEPKGNAME=yandex-browser-beta
 fi