diff options
| author |   Tim Harder <radhermit@gmail.com> | 2018-03-06 01:44:38 -0500 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2018-03-06 01:45:17 -0500 |
| commit | 5db4192a578a8df56fad1566d22f2446c02c1632 (patch) | |
| tree | 68511bae7ba3b9bca74dbd33cd79f28725f3ee6d | |
| parent | merge.triggers: SavePkg: fix repo_id check for newly built pkgs (diff) | |
| download | pkgcore-5db4192a578a8df56fad1566d22f2446c02c1632.tar.gz pkgcore-5db4192a578a8df56fad1566d22f2446c02c1632.tar.bz2 pkgcore-5db4192a578a8df56fad1566d22f2446c02c1632.zip | |
Revert "ebd/helpers/common/doins: using xargs to decrease install calls"
Use working impl until python ipc method is ready.
This reverts commit c0c7e4b012159dfe61affd5d11ff81f8e0a6d1cf.
| -rwxr-xr-x | ebd/helpers/common/doins | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/ebd/helpers/common/doins b/ebd/helpers/common/doins index 740973ab..ef4894f1 100755 --- a/ebd/helpers/common/doins +++ b/ebd/helpers/common/doins @@ -14,10 +14,8 @@ if [[ -n ${INSDESTTREE} && -z ${INSDESTTREE%${ED}*} ]]; then __helper_exit 2 "do not give \${D} nor \${ED} as part of the pathways to doins" fi -declare -A FILE_MAPPING - install_paths() { - local mydir=${1:-.} + local mydir=$1 shift check_command invoke_script dodir "${mydir}" || return 1 @@ -43,15 +41,10 @@ install_paths() { __shopt_pop continue fi - FILE_MAPPING[${mydir}]+=" ${mysrc}" + check_command install ${INSOPTIONS} -- "${mysrc}" "${ED}${mydir}" + # cleanup the tempspace... + [[ ${mysrc} != ${x} ]] && rm -f "${mysrc}" done } -# create dirs and determine file mapping install_paths "${INSDESTTREE}" "$@" - -# install files using xargs to decrease install calls -for dir in "${!FILE_MAPPING[@]}"; do - echo "${FILE_MAPPING[${dir}]}" | ${XARGS} install ${INSOPTIONS} -t "${ED}${dir}" -- - assert "install failed" -done |