Commit 9387be94 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack: add __epm_check_repack_rule(), change __epm_have_repack_rule() and use it

parent d18315a4
......@@ -85,7 +85,7 @@ __epm_pack()
# don't repack by default there is our pkg format
__epm_split_by_pkg_type $PKGFORMAT $returntarname && dorepack=''
# repack if we have a repack rule for it
[ -z "$norepack" ] && __epm_have_repack_rule $returntarname && dorepack='--repack'
[ -z "$norepack" ] && __epm_check_repack_rule $returntarname && dorepack='--repack'
# repack if forced
[ -n "$repack" ] && dorepack='--repack'
......
......@@ -25,6 +25,14 @@ load_helper epm-status
__epm_have_repack_rule()
{
# FIXME: use real way (for any archive)
local pkgname="$(epm print name for package "$1")"
local repackcode="$EPM_REPACK_SCRIPTS_DIR/$pkgname.sh"
[ -s "$repackcode" ]
}
__epm_check_repack_rule()
{
# skip repacking on non ALT systems
[ "$BASEDISTRNAME" = "alt" ] || return 1
......@@ -33,17 +41,14 @@ __epm_have_repack_rule()
# skip for packages built with repack
epm_status_repacked "$i" && return 1
# FIXME: use real way (for any archive)
local pkgname="$(epm print name for package "$i")"
local repackcode="$EPM_REPACK_SCRIPTS_DIR/$pkgname.sh"
[ -s "$repackcode" ] || return 1
__epm_have_repack_rule "$i" || return 1
done
return 0
}
__epm_check_if_needed_repack()
{
__epm_have_repack_rule "$@" || return
__epm_check_repack_rule "$@" || return
local pkgname="$(epm print name for package "$1")"
warning "There is repack rule for '$pkgname' package. It is better install this package via 'epm install --repack' or 'epm play'."
}
......
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