From 8531927dc0a6ffb7ca138132b3604066533781a5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 4 Feb 2006 05:28:59 +0000
Subject: touchup code so we handle errors better

svn path=/main/trunk/; revision=2652
---
 bin/doconfd | 11 +++++------
 bin/doenvd  | 11 +++++------
 bin/doinitd | 11 +++++------
 3 files changed, 15 insertions(+), 18 deletions(-)

(limited to 'bin')

diff --git a/bin/doconfd b/bin/doconfd
index e48321637..e9ea1fdfb 100755
--- 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 01197a07d..5232ed908 100755
--- 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 60dc6bc31..8aae1b383 100755
--- 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
-- 
cgit v1.2.3-1-g7c22