Commit 85f32bc6 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm pack: improve

parent 1546c5e0
...@@ -38,18 +38,19 @@ __epm_pack() ...@@ -38,18 +38,19 @@ __epm_pack()
#TODO: --verbose support #TODO: --verbose support
set_sudo set_sudo
export SUDO export SUDO
$repackcode $tarname $filefortarname || fatal $repackcode "$tarname" "$filefortarname" || fatal
returntarname="$(cat $filefortarname)" returntarname="$(cat "$filefortarname")" || fatal "pack script $repackcode didn't set tarname"
if [ -n "$download_only" ] ; then if [ -n "$download_only" ] ; then
cp $returntarname . cp $returntarname .
return return
fi fi
[ -s "$returntarname" ] || fatal "pack script $repackcode didn't return tarname"
mv $returntarname $tmpdir/ || fatal mv $returntarname $tmpdir/ || fatal
cd $tmpdir || fatal cd $tmpdir || fatal
epm repack --quiet "$(basename "$returntarname")" docmd epm repack --quiet "$(basename "$returntarname")"
packed_pkgs="$tmpdir/$(echo *.rpm)" packed_pkgs="$tmpdir/$(echo *.rpm)"
} }
...@@ -89,16 +90,17 @@ epm_pack() ...@@ -89,16 +90,17 @@ epm_pack()
pkg_urls="$tarname" pkg_urls="$tarname"
load_helper epm-download load_helper epm-download
__handle_pkg_urls_to_install __handle_pkg_urls_to_install
tarname="$pkg_files" # drop spaces
tarname="$(echo $pkg_files)"
elif [ -d "$tarname" ] ; then elif [ -d "$tarname" ] ; then
fatal "FIXME" fatal "FIXME: implement packing of the dir $tarname?"
tarname='' tarname=''
fi fi
if __epm_pack $packname $tarname && [ -n "$packed_pkgs" ] ; then if __epm_pack "$packname" "$tarname" && [ -n "$packed_pkgs" ] ; then
#FIXME #FIXME
if [ -n "$install" ] ; then if [ -n "$install" ] ; then
epm install $packed_pkgs docmd epm install $packed_pkgs
return return
fi fi
......
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