Error check; tidy

3 files changed, 31 insertions, 25 deletions

diff --git a/games-fps/enemy-territory/ChangeLog b/games-fps/enemy-territory/ChangeLog
index 4512b5ea6e4d..b25a44fa0c2d 100644
--- a/games-fps/enemy-territory/ChangeLog
+++ b/games-fps/enemy-territory/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/enemy-territory
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.13 2004/07/01 11:16:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.14 2004/07/05 23:58:57 mr_bones_ Exp $
+
+  05 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  enemy-territory-2.56-r2.ebuild:
+  Error check; tidy
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   enemy-territory-2.56-r2.ebuild:
diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
index 055430d5d015..87036cd3f4f8 100644
--- a/games-fps/enemy-territory/Manifest
+++ b/games-fps/enemy-territory/Manifest
@@ -1,8 +1,8 @@
-MD5 9bbbb862301f8d178a0d38d6f8fc9df1 ChangeLog 2363
-MD5 56d17ee47f251344b2f2d0d01dba630c enemy-territory-2.56-r2.ebuild 2424
+MD5 6267d435951821707accb732f8134b06 ChangeLog 2472
 MD5 f414f5eb26874bc33efe3ac1f0beab5d metadata.xml 1049
-MD5 4923bd56bd1be4356324b1af17f47ac5 files/digest-enemy-territory-2.56-r2 71
+MD5 2315bbef444a842eca1353aaacdd22e9 enemy-territory-2.56-r2.ebuild 2571
+MD5 f3437b926c789923908f21c64694791d files/et-ded.conf.d 340
 MD5 9706616a064d2425aa5d8d8775995955 files/et 43
 MD5 69d783cd9fed81e4aacd11281d36ebe9 files/et-ded 46
-MD5 0da33eb9048f63e76245d3117de134a9 files/et-ded.conf.d 339
-MD5 a8a9b391509a683c0eb1ae550320bb97 files/et-ded.rc 880
+MD5 0cb20f17c3872e7516afb15f18f97b9f files/et-ded.rc 881
+MD5 4923bd56bd1be4356324b1af17f47ac5 files/digest-enemy-territory-2.56-r2 71
diff --git a/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild b/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild
index 8535dbd1fc28..61cd2df57f94 100644
--- a/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild
+++ b/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild,v 1.8 2004/07/01 11:16:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild,v 1.9 2004/07/05 23:58:58 mr_bones_ Exp $
 
 inherit games
 
@@ -21,9 +21,9 @@ RDEPEND="dedicated? ( app-misc/screen )
 	!dedicated? ( virtual/opengl )
 	opengl? ( virtual/opengl )"
 
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
+S="${WORKDIR}"
+dir="${GAMES_PREFIX_OPT}/${PN}"
+Ddir="${D}/${dir}"
 
 pkg_setup() {
 	check_license || die "License check failed"
@@ -35,33 +35,35 @@ src_unpack() {
 }
 
 src_install() {
-	dodir ${dir}
+	exeinto "${dir}"
+	doexe bin/Linux/x86/* openurl.sh || die "doexe failed"
+	insinto "${dir}"
+	doins CHANGES v1.02_Readme.htm || die "doins failed"
+	insinto /usr/share/pixmaps
+	doins ET.xpm
 
-	cp -r Docs pb etmain ${Ddir}
+	cp -r Docs pb etmain "${Ddir}" || die "cp failed"
 
-	exeinto ${dir} ; doexe bin/Linux/x86/* openurl.sh
-	insinto ${dir} ; doins CHANGES v1.02_Readme.htm
-	insinto /usr/share/pixmaps ; doins ET.xpm
-
-	dogamesbin ${FILESDIR}/et
+	dogamesbin "${FILESDIR}/et" || die "dogamesbin failed"
 	dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/et
 	if use dedicated ; then
-		dogamesbin ${FILESDIR}/et-ded
-		dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/et-ded
-		exeinto /etc/init.d ; newexe ${FILESDIR}/et-ded.rc et-ded
+		dogamesbin "${FILESDIR}/et-ded" || die "dogamesbin failed"
+		dosed "s:GENTOO_DIR:${dir}:" "${GAMES_BINDIR}/et-ded"
+		exeinto /etc/init.d
+		newexe "${FILESDIR}/et-ded.rc" et-ded || die "newexe failed"
 		dosed "s:GAMES_USER_DED:${GAMES_USER_DED}:" /etc/init.d/et-ded
 		dosed "s:GENTOO_DIR:${GAMES_BINDIR}:" /etc/init.d/et-ded
-		insinto /etc/conf.d ; newins ${FILESDIR}/et-ded.conf.d et-ded
+		insinto /etc/conf.d
+		newins "${FILESDIR}/et-ded.conf.d" et-ded || die "newins failed"
 	fi
 
 	# TODO: move this to /var/ perhaps ?
-	dodir ${dir}/etwolf-homedir
-	dosym ${dir}/etwolf-homedir ${GAMES_PREFIX}/.etwolf
-	keepdir ${dir}/etwolf-homedir
+	dodir "${dir}/etwolf-homedir"
+	dosym "${dir}/etwolf-homedir" "${GAMES_PREFIX}/.etwolf"
 
 	prepgamesdirs
 	make_desktop_entry et "Enemy Territory" ET.xpm
-	chmod g+rw ${Ddir} ${Ddir}/etwolf-homedir ${Ddir}/etmain
+	chmod g+rw "${Ddir}" "${Ddir}/etwolf-homedir" "${Ddir}/etmain"
 }
 
 pkg_postinst() {