Commit 4f22162b authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack: add check if the package name is the same as was in play.d script

parent 6916f592
......@@ -218,6 +218,8 @@ __epm_repack_to_rpm()
# run generic scripts and repack script for the pkg
cd $buildroot || fatal
[ -n "$EEPM_INTERNAL_PKGNAME" ] && [ "$EEPM_INTERNAL_PKGNAME" != "$pkgname" ] && fatal "Some bug: the name of the repacking package ($pkgname) differs with the package name ($EEPM_INTERNAL_PKGNAME) from play.d script."
__fix_spec $pkgname $buildroot $spec
__apply_fix_code "generic" $buildroot $spec $pkgname $abspkg $SUBGENERIC
__apply_fix_code "generic-$SUBGENERIC" $buildroot $spec $pkgname $abspkg
......
......@@ -105,5 +105,5 @@ install_file()
cp "$src" "$dest" || return
}
# set PRODUCT by pack.d script name
[ -n "$PRODUCT" ] || PRODUCT="$(basename $0 .sh)"
......@@ -362,3 +362,5 @@ fi
echo
echo "Installing $DESCRIPTION as $PKGNAME package ..."
export EEPM_INTERNAL_PKGNAME="$PKGNAME"
......@@ -8,6 +8,8 @@ PRODUCTDIR=/opt/$PRODUCT
. $(dirname $0)/common.sh
[ "$PRODUCT" = "AppImage" ] && fatal "Can't recognize correct package name ($PRODUCT is incorrect name)"
# move package to /opt
ROOTDIR=$(basename $(find $BUILDROOT -mindepth 1 -maxdepth 1 -type d))
move_to_opt /$ROOTDIR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment