proper quoting and error checking

Package-Manager: portage-2.0.51.22-r2

3 files changed, 34 insertions, 35 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/Manifest b/sys-apps/apmd/Manifest
index 5afeebc376fb..e872d9c0ca42 100644
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 372292f0cfff361d5c0a5cbd58e4ad48 apmd-3.2.1_p4.ebuild 1619
 MD5 88e3463d354ae8c261776456764ad06e apmd-3.0.2-r3.ebuild 1781
-MD5 27e5317f463949dfc99f018f5fcc2527 apmd-3.2.0.ebuild 1856
-MD5 77c24f11fc8f56930e31cffbed609825 ChangeLog 3729
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
+MD5 d7eac5d73a82b549ea0729c362e88a91 apmd-3.2.1_p4.ebuild 1732
+MD5 27e5317f463949dfc99f018f5fcc2527 apmd-3.2.0.ebuild 1856
+MD5 2375e71cebe5c1511de8c35225c34d7c ChangeLog 3848
 MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61
-MD5 648c4b025de00c2bf42aafaebed2f4ef files/digest-apmd-3.2.1_p4 130
+MD5 5aa18e3b8ad79d8893bddb038e29ab98 files/apmd.confd 161
 MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
-MD5 bdb989641f5be7797a3232a8691ebc66 files/apmd.rc6 672
-MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
-MD5 253b79375ab72606e4fdf89109ed2c03 files/apmsleep.c.diff.3.2.0 301
 MD5 bed1c6668552bbf528df267c302a75eb files/apmd-3.2.0.kernel26x.patch 627
+MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
+MD5 648c4b025de00c2bf42aafaebed2f4ef files/digest-apmd-3.2.1_p4 130
+MD5 bdb989641f5be7797a3232a8691ebc66 files/apmd.rc6 672
 MD5 a2b499e3ffda161e88b518f5b830a434 files/digest-apmd-3.2.0 66
-MD5 5aa18e3b8ad79d8893bddb038e29ab98 files/apmd.confd 161
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDJz8momPajV0RnrERAlO2AJ9Z+5tBgcsNYZ82RhdLqd8WQNROXACeL4fH
-9QPRpNutxIzxAhjF/sEaAVQ=
-=m3KA
------END PGP SIGNATURE-----
+MD5 253b79375ab72606e4fdf89109ed2c03 files/apmsleep.c.diff.3.2.0 301
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
 }