From 26e962f5125940b296016f22901b608a5c49a6e2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 30 Mar 2008 19:51:53 +0000 Subject: * Fix broken return value for doins. * Make newins cleanup temp files after itself. (trunk r9634) svn path=/main/branches/2.1.2/; revision=9635 --- bin/doins | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'bin/doins') diff --git a/bin/doins b/bin/doins index 945938c8b..57a21c4bb 100755 --- a/bin/doins +++ b/bin/doins @@ -28,7 +28,7 @@ fi [[ ! -d ${D}${INSDESTTREE} ]] && dodir "${INSDESTTREE}" _doins() { - local mysrc="$1" mydir="$2" cleanup="" + local mysrc="$1" mydir="$2" cleanup="" rval if [ -L "$mysrc" ] ; then cp "$mysrc" "${T}" @@ -37,7 +37,9 @@ _doins() { fi install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}/${mydir}" + rval=$? [[ -n ${cleanup} ]] && rm -f "${cleanup}" + return $rval } _xdoins() { @@ -46,6 +48,8 @@ _xdoins() { done } +success=0 + for x in "$@" ; do if [ -d "$x" ] ; then if [ "${DOINSRECUR}" == "n" ] ; then @@ -63,7 +67,10 @@ for x in "$@" ; do find "${x##*/}" -type d -exec dodir "${INSDESTTREE}/{}" \; find "${x##*/}" \( -type f -or -type l \) -print0 | _xdoins popd >/dev/null + ((++success)) else - _doins "${x}" + _doins "${x}" && ((++success)) fi done + +[ $success -gt 0 ] && exit 0 || exit 1 -- cgit v1.2.3-1-g7c22