Skip to content

E
eepm
Commit 1490ecba authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

epm-repack: add support for EPM_REPACK_SCRIPTS_DIR

parent 74cbd93a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
bin/epm-repack
View file @ 1490ecba
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
load_helper epm-sh-altlinux load_helper epm-sh-altlinux
load_helper epm-assure load_helper epm-assure
[ -n "$EPM_REPACK_SCRIPTS_DIR" ] || EPM_REPACK_SCRIPTS_DIR="$CONFIGDIR/repack.d"
__epm_check_if_needed_repack() __epm_check_if_needed_repack()
{ {
...@@ -168,7 +170,7 @@ EOF ...@@ -168,7 +170,7 @@ EOF
# args: pkgname buildroot spec # args: pkgname buildroot spec
__apply_fix_code() __apply_fix_code()
{ {
local repackcode="$(realpath $CONFIGDIR/repack.d/$1.sh)" local repackcode="$(realpath $EPM_REPACK_SCRIPTS_DIR/$1.sh)"
[ -x "$repackcode" ] || return [ -x "$repackcode" ] || return
shift shift
export PATH=$PROGDIR:$PATH export PATH=$PROGDIR:$PATH
...@@ -402,7 +404,7 @@ __epm_repack() ...@@ -402,7 +404,7 @@ __epm_repack()
# FIXME: only one package in $@ is supported # FIXME: only one package in $@ is supported
#local pkgname="$(epm print name from "$@")" #local pkgname="$(epm print name from "$@")"
__set_version_pkgname "$1" __set_version_pkgname "$1"
local repackcode="$CONFIGDIR/repack.d/$PKGNAME.sh" local repackcode="$EPM_REPACK_SCRIPTS_DIR/$PKGNAME.sh"
if [ -x "$repackcode" ] ; then if [ -x "$repackcode" ] ; then
__epm_repack_to_rpm "$@" || return __epm_repack_to_rpm "$@" || return
[ -n "$repacked_pkgs" ] || return [ -n "$repacked_pkgs" ] || return
......
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