Fix use invocation and add error checking

3 files changed, 27 insertions, 21 deletions

diff --git a/app-text/sword-modules/ChangeLog b/app-text/sword-modules/ChangeLog
index c16a3c0ed5ee..be8d917671e0 100644
--- a/app-text/sword-modules/ChangeLog
+++ b/app-text/sword-modules/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/sword-modules
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/ChangeLog,v 1.4 2004/05/03 20:27:00 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/ChangeLog,v 1.5 2004/06/08 21:33:36 agriffis Exp $
+
+  08 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  sword-modules-20040406.ebuild, sword-modules-20040503.ebuild:
+  Fix use invocation and add error checking
 
 *sword-modules-20040503 (03 May 2004)
 
diff --git a/app-text/sword-modules/sword-modules-20040406.ebuild b/app-text/sword-modules/sword-modules-20040406.ebuild
index 7dc148fbcc28..b41e8ee3b8ee 100644
--- a/app-text/sword-modules/sword-modules-20040406.ebuild
+++ b/app-text/sword-modules/sword-modules-20040406.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/sword-modules-20040406.ebuild,v 1.1 2004/04/07 02:20:47 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/sword-modules-20040406.ebuild,v 1.2 2004/06/08 21:33:36 agriffis Exp $
 
 DESCRIPTION="a collection of modules for the sword project"
 HOMEPAGE="http://www.crosswire.org/sword/"
@@ -53,7 +53,7 @@ unpack YLT.zip > /dev/null
 unpack Vulgate.zip > /dev/null
 unpack Josephus.zip > /dev/null
 
-if [ "`use offensive`" ]; then
+if use offensive; then
 	unpack BoM.zip > /dev/null
 	unpack Jasher.zip > /dev/null
 	# uh oh, the quran is only availabe for windows; extract the data
@@ -69,15 +69,16 @@ src_compile() {
 }
 
 src_install () {
-	dodir /usr/share/sword/modules
-	cp -a ${S}/modules/* ${D}/usr/share/sword/modules/
-	dodir /usr/share/sword/mods.d
+	dodir /usr/share/sword/modules || die
+	cp -a ${S}/modules/* ${D}/usr/share/sword/modules/ || die
+	dodir /usr/share/sword/mods.d || die
+	cp ${S}/mods.d/* ${D}/usr/share/sword/mods.d/ || die
 
 	# there are windows-only modules in the offensive flag that put
 	# config files into /newmods instead of /mods.d
-	use offensive && cp ${S}/newmods/* ${D}/usr/share/sword/mods.d/
-
-	cp ${S}/mods.d/* ${D}/usr/share/sword/mods.d/
+	if use offensive; then
+		cp ${S}/newmods/* ${D}/usr/share/sword/mods.d/ || die
+	fi
 }
 
 pkg_postinst() {
@@ -85,11 +86,11 @@ pkg_postinst() {
 	einfo "You should now have modules for The SWORD Project."
 	einfo "You can download more modules from the SWORD homepage:"
 	einfo "  http://www.crosswire.org/sword/"
-	use offensive || {
+	if ! use offensive; then
 		echo
 		einfo "You do not have the offensive USE flag enabled."
 		einfo "Questionable texts were not installed. To install them,"
 		einfo "USE=\"offensive\" emerge sword-modules"
 		echo
-	}
+	fi
 }
diff --git a/app-text/sword-modules/sword-modules-20040503.ebuild b/app-text/sword-modules/sword-modules-20040503.ebuild
index 45cf9988b6db..15e59a132dfa 100644
--- a/app-text/sword-modules/sword-modules-20040503.ebuild
+++ b/app-text/sword-modules/sword-modules-20040503.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/sword-modules-20040503.ebuild,v 1.1 2004/05/03 20:27:00 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword-modules/sword-modules-20040503.ebuild,v 1.2 2004/06/08 21:33:36 agriffis Exp $
 
 DESCRIPTION="a collection of modules for the sword project"
 HOMEPAGE="http://www.crosswire.org/sword/"
@@ -55,7 +55,7 @@ src_unpack() {
 	unpack Vulgate.zip > /dev/null
 	unpack Josephus.zip > /dev/null
 
-	if [ "`use offensive`" ]; then
+	if use offensive; then
 		unpack BoM.zip > /dev/null
 		unpack Jasher.zip > /dev/null
 		# uh oh, the quran is only availabe for windows; extract the data
@@ -71,15 +71,16 @@ src_compile() {
 }
 
 src_install () {
-	dodir /usr/share/sword/modules
-	cp -a ${S}/modules/* ${D}/usr/share/sword/modules/
-	dodir /usr/share/sword/mods.d
+	dodir /usr/share/sword/modules || die
+	cp -a ${S}/modules/* ${D}/usr/share/sword/modules/ || die
+	dodir /usr/share/sword/mods.d || die
+	cp ${S}/mods.d/* ${D}/usr/share/sword/mods.d/ || die
 
 	# there are windows-only modules in the offensive flag that put
 	# config files into /newmods instead of /mods.d
-	use offensive && cp ${S}/newmods/* ${D}/usr/share/sword/mods.d/
-
-	cp ${S}/mods.d/* ${D}/usr/share/sword/mods.d/
+	if use offensive; then
+		cp ${S}/newmods/* ${D}/usr/share/sword/mods.d/ || die
+	fi
 }
 
 pkg_postinst() {
@@ -87,11 +88,11 @@ pkg_postinst() {
 	einfo "You should now have modules for The SWORD Project."
 	einfo "You can download more modules from the SWORD homepage:"
 	einfo "  http://www.crosswire.org/sword/"
-	use offensive || {
+	if ! use offensive; then
 		echo
 		einfo "You do not have the offensive USE flag enabled."
 		einfo "Questionable texts were not installed. To install them,"
 		einfo "USE=\"offensive\" emerge sword-modules"
 		echo
-	}
+	fi
 }