touchup code so we handle errors better

svn path=/main/trunk/; revision=2652

diff --git a/bin/doconfd b/bin/doconfd
index e48321637f02a8748ad488fdf7ea61f1e9648183..e9ea1fdfbf9e9c737aae644ceef10d89d50da1f6 100755 (executable)
--- a/bin/doconfd
+++ b/bin/doconfd
@@ -3,13 +3,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/doconfd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
 
-if [ ${#} -lt 1 ] ; then
-       echo "doconfd: at least one argument needed"
+if [[ $# -lt 1 ]] ; then
+       echo "$0: at least one argument needed" 1>&2
        exit 1
 fi
 
-tmp_INSDESTTREE="${INSDESTTREE}"
-INSDESTTREE=/etc/conf.d/
+exec \
+env \
+INSDESTTREE="/etc/conf.d/" \
 doins "$@"
-INSDESTTREE="${tmp_INSDESTTREE}"
-unset tmp_INSDESTTREE

diff --git a/bin/doenvd b/bin/doenvd
index 01197a07dfd3420dec79a8611d39c0998367acc6..5232ed908b88345a192028485385b7689ce97c5d 100755 (executable)
--- a/bin/doenvd
+++ b/bin/doenvd
@@ -3,13 +3,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/doenvd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
 
-if [ ${#} -lt 1 ] ; then
-       echo "doenvd: at least one argument needed"
+if [[ $# -lt 1 ]] ; then
+       echo "$0: at least one argument needed" 1>&2
        exit 1
 fi
 
-tmp_INSDESTTREE="${INSDESTTREE}"
-INSDESTTREE=/etc/env.d/
+exec \
+env \
+INSDESTTREE="/etc/env.d/" \
 doins "$@"
-INSDESTTREE="${tmp_INSDESTTREE}"
-unset tmp_INSDESTTREE

diff --git a/bin/doinitd b/bin/doinitd
index 60dc6bc31518df2cad1713ef3edd0b9b16974190..8aae1b383925f3a456a2326d6e34494d5a1b4e72 100755 (executable)
--- a/bin/doinitd
+++ b/bin/doinitd
@@ -3,13 +3,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: /var/cvsroot/gentoo-src/portage/bin/doinitd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $
 
-if [ ${#} -lt 1 ] ; then
-       echo "doinitd: at least one argument needed"
+if [[ $# -lt 1 ]] ; then
+       echo "$0: at least one argument needed" 1>&2
        exit 1
 fi
 
-tmp_EXEDESTTREE="${EXEDESTTREE}"
-EXEDESTTREE=/etc/init.d/
+exec \
+env \
+EXEDESTTREE="/etc/init.d/" \
 doexe "$@"
-EXEDESTTREE="${tmp_EXEDESTTREE}"
-unset tmp_EXEDESTTREE