proper quoting and error checking

(Portage version: 2.0.51.22-r2)

2 files changed, 26 insertions, 17 deletions

diff --git a/sys-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog
index 1af6e5112be9..0333c766fa0e 100644
--- a/sys-apps/apmd/ChangeLog
+++ b/sys-apps/apmd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/apmd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.24 2005/09/13 21:05:13 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.25 2005/09/15 01:43:20 mr_bones_ Exp $
+
+  15 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> apmd-3.2.1_p4.ebuild:
+  proper quoting and error checking
 
   13 Sep 2005; <dang@gentoo.org> apmd-3.2.1_p4.ebuild:
   Fix multilib-strict failure.  Bug #105846
diff --git a/sys-apps/apmd/apmd-3.2.1_p4.ebuild b/sys-apps/apmd/apmd-3.2.1_p4.ebuild
index 582d81b485aa..9af22ee18733 100644
--- a/sys-apps/apmd/apmd-3.2.1_p4.ebuild
+++ b/sys-apps/apmd/apmd-3.2.1_p4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.14 2005/09/13 21:05:13 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.15 2005/09/15 01:43:20 mr_bones_ Exp $
 
 inherit eutils multilib
 
@@ -8,7 +8,6 @@ MY_PV="${PV%_p*}"
 MY_P="${PN}_${MY_PV}"
 PATCHV="${PV#*_p}"
 
-S="${WORKDIR}/${PN}-${MY_PV}.orig"
 DESCRIPTION="Advanced Power Management Daemon"
 HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
 SRC_URI="mirror://debian/pool/main/a/apmd/${MY_P}.orig.tar.gz
@@ -22,42 +21,49 @@ IUSE="X nls"
 RDEPEND=">=sys-apps/debianutils-1.16
 	X? ( virtual/x11 )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	virtual/os-headers"
 
+S=${WORKDIR}/${PN}-${MY_PV}.orig
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${MY_P}-${PATCHV}.diff
+	cd "${S}"
+	epatch "${WORKDIR}"/${MY_P}-${PATCHV}.diff
 
 	if ! use X ; then
-		sed -e 's:\(EXES=.*\)xapm:\1:' \
+		sed -i \
+			-e 's:\(EXES=.*\)xapm:\1:' \
 			-e 's:\(.*\)\$(LT_INSTALL).*xapm.*$:\1echo:' \
-			-i ${S}/Makefile
+			"${S}"/Makefile \
+			|| die "sed failed"
 	fi
 }
 
 src_compile() {
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
 	dodir /usr/sbin
 
-	make DESTDIR=${D} PREFIX=/usr LIBDIR=/usr/$(get_libdir) install || die "install failed"
+	make DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) install \
+		|| die "install failed"
 
-	dodir /etc/apm/{event.d,suspend.d,resume.d,other.d,scripts.d}
-	exeinto /etc/apm ; doexe debian/apmd_proxy
-	dodoc AUTHORS apmsleep.README README debian/README.Debian
-	dodoc debian/changelog* debian/copyright*
+	keepdir /etc/apm/{event.d,suspend.d,resume.d,other.d,scripts.d}
+	exeinto /etc/apm
+	doexe debian/apmd_proxy || die "doexe failed"
+	dodoc AUTHORS apmsleep.README README debian/README.Debian \
+		debian/changelog* debian/copyright*
 
 	doman *.1 *.8
 
 	# note: apmd_proxy.conf is currently disabled and not used, thus
 	#       not installed - liquidx (01 Mar 2004)
 
-	insinto /etc/conf.d ; newins ${FILESDIR}/apmd.confd apmd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apmd.rc6 apmd
+	insinto /etc/conf.d
+	newins "${FILESDIR}"/apmd.confd apmd || die "newins failed"
+	exeinto /etc/init.d
+	newexe "${FILESDIR}"/apmd.rc6 apmd || die "newexe failed"
 
-	use nls || rm -rf ${D}/usr/share/man/fr
+	use nls || rm -rf "${D}"/usr/share/man/fr
 }