aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'bin/ebuild-helpers/newins')
-rwxr-xr-xbin/ebuild-helpers/newins12
1 files changed, 9 insertions, 3 deletions
diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins
index 1e11b432e..3d4870f8d 100755
--- a/bin/ebuild-helpers/newins
+++ b/bin/ebuild-helpers/newins
@@ -2,13 +2,15 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
+
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
- echo "$0: Need two arguments, old file and new file" 1>&2
+ helpers_die "$0: Need two arguments, old file and new file"
exit 1
fi
if [ ! -e "$1" ] ; then
- echo "!!! ${0##*/}: $1 does not exist" 1>&2
+ helpers_die "!!! ${0##*/}: $1 does not exist"
exit 1
fi
@@ -18,10 +20,14 @@ case "$EAPI" in
cp "$1" "$T/$2" || exit $?
;;
*)
- cp -P "$1" "$T/$2" || exit $?
+ cp -P "$1" "$T/$2"
+ ret=$?
+ [[ $ret -ne 0 ]] && helpers_die "$0 failed"
+ exit $ret
;;
esac
doins "${T}/${2}"
ret=$?
rm -rf "${T}/${2}"
+[[ $ret -ne 0 ]] && helpers_die "$0 failed"
exit $ret