Skip to content

E
eepm
Commit 1996c2c6 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

epm-repack: fix order args for __fix_spec()

parent 5dfb6190
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
bin/epm-repack
View file @ 1996c2c6
...@@ -86,12 +86,12 @@ __epm_check_if_try_install_rpm() ...@@ -86,12 +86,12 @@ __epm_check_if_try_install_rpm()
} }
# args: buildroot spec # args: pkgname buildroot spec
__fix_spec() __fix_spec()
{ {
local buildroot="$1" local pkgname="$1"
local spec="$2" local buildroot="$2"
local pkgname="$3" local spec="$3"
local i local i
# drop forbidded paths # drop forbidded paths
...@@ -140,6 +140,7 @@ EOF ...@@ -140,6 +140,7 @@ EOF
} }
# args: pkgname buildroot spec
__apply_fix_code() __apply_fix_code()
{ {
local repackcode="$CONFIGDIR/repack.d/$1.sh" local repackcode="$CONFIGDIR/repack.d/$1.sh"
...@@ -221,7 +222,7 @@ __epm_repack_to_rpm() ...@@ -221,7 +222,7 @@ __epm_repack_to_rpm()
mv $spec $tmpbuilddir || fatal mv $spec $tmpbuilddir || fatal
spec="$tmpbuilddir/$(basename "$spec")" spec="$tmpbuilddir/$(basename "$spec")"
local pkgname="$(grep "^Name: " $spec | sed -e "s|Name: ||g" | head -n1)" local pkgname="$(grep "^Name: " $spec | sed -e "s|Name: ||g" | head -n1)"
__fix_spec $tmpbuilddir/$subdir $spec $pkgname __fix_spec $pkgname $tmpbuilddir/$subdir $spec
__apply_fix_code $pkgname $tmpbuilddir/$subdir $spec __apply_fix_code $pkgname $tmpbuilddir/$subdir $spec
# TODO: we need these dirs to be created # TODO: we need these dirs to be created
to_remove_pkg_dirs="$to_remove_pkg_dirs $HOME/RPM/BUILD $HOME/RPM" to_remove_pkg_dirs="$to_remove_pkg_dirs $HOME/RPM/BUILD $HOME/RPM"
......
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