cleanup and simplify

7 files changed, 34 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index 96a22b1..7bf8a84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
 # ChangeLog for Portage; the Gentoo Linux ports system 
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.968 2005/05/04 22:49:13 vapier Exp $
+# $Id: ChangeLog,v 1.969 2005/05/04 23:14:40 vapier Exp $
 
   MAJOR CHANGES in 2.0.51:
     1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
     2. /var/cache/edb/world is now /var/lib/portage/world.
     3. /etc/portage/profile/virtuals is _USER_ configs only.
 
+  04 May 2005; Mike Frysinger <vapier@gentoo.org> bin/{do,new}{env,conf,init}d:
+  Touch up and simplify.
+
   04 May 2005; Mike Frysinger <vapier@gentoo.org> bin/fowners bin/fperms:
   Add recursive (-R) support to fowners/fperms.
 
diff --git a/bin/doconfd b/bin/doconfd
index 87183f8..6204a3f 100755
--- a/bin/doconfd
+++ b/bin/doconfd
@@ -1,15 +1,12 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doconfd,v 1.3 2005/02/26 04:14:19 jstubbs Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doconfd,v 1.4 2005/05/04 23:14:40 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/
-doins "$@"
-INSDESTTREE="${tmp_INSDESTTREE}"
-unset tmp_INSDESTTREE
+exec env INSDESTTREE=/etc/conf.d/ INSOPTIONS="-m0644" \
+	doins "$@"
diff --git a/bin/doenvd b/bin/doenvd
index 45f9274..6c6500e 100755
--- a/bin/doenvd
+++ b/bin/doenvd
@@ -1,15 +1,12 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doenvd,v 1.3 2005/02/26 04:14:19 jstubbs Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doenvd,v 1.4 2005/05/04 23:14:40 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/
-doins "$@"
-INSDESTTREE="${tmp_INSDESTTREE}"
-unset tmp_INSDESTTREE
+exec env INSDESTTREE=/etc/env.d/ INSOPTIONS="-m0644" \
+	doins "$@"
diff --git a/bin/doinitd b/bin/doinitd
index 559294c..0471fbd 100755
--- a/bin/doinitd
+++ b/bin/doinitd
@@ -1,15 +1,12 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doinitd,v 1.3 2005/02/26 04:14:19 jstubbs Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/doinitd,v 1.4 2005/05/04 23:14:40 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/
-doexe "$@"
-EXEDESTTREE="${tmp_EXEDESTTREE}"
-unset tmp_EXEDESTTREE
+exec env EXEDESTTREE=/etc/init.d/ \
+	doexe "$@"
diff --git a/bin/newconfd b/bin/newconfd
index 36881be..b9042c9 100755
--- a/bin/newconfd
+++ b/bin/newconfd
@@ -1,13 +1,13 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newconfd,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newconfd,v 1.3 2005/05/04 23:14:40 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
-	echo "Nothing defined to do."
+	echo "$0: nothing defined to do" 1>&2
 	exit 1
 fi
 
 rm -rf "${T}/${2}"
 cp "${1}" "${T}/${2}"
-doconfd "${T}/${2}"
+exec doconfd "${T}/${2}"
diff --git a/bin/newenvd b/bin/newenvd
index 08eade0..3acb06e 100755
--- a/bin/newenvd
+++ b/bin/newenvd
@@ -1,13 +1,13 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newenvd,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newenvd,v 1.3 2005/05/04 23:14:40 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
-	echo "Nothing defined to do."
+	echo "$0: nothing defined to do" 1>&2
 	exit 1
 fi
 
 rm -rf "${T}/${2}"
 cp "${1}" "${T}/${2}"
-doenvd "${T}/${2}"
+exec doenvd "${T}/${2}"
diff --git a/bin/newinitd b/bin/newinitd
index 69db068..3544057 100755
--- a/bin/newinitd
+++ b/bin/newinitd
@@ -1,13 +1,13 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newinitd,v 1.2 2004/10/04 13:56:50 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/newinitd,v 1.3 2005/05/04 23:14:40 vapier Exp $
 
 if [ -z "${T}" ] || [ -z "${2}" ] ; then
-	echo "Nothing defined to do."
+	echo "$0: nothing defined to do" 1>&2
 	exit 1
 fi
 
 rm -rf "${T}/${2}"
 cp "${1}" "${T}/${2}"
-doinitd "${T}/${2}"
+exec doinitd "${T}/${2}"