Fix quoting and some minor cleanups.

(Portage version: 2.1.4.4)

2 files changed, 54 insertions, 49 deletions

diff --git a/games-fps/ut2003-data/ChangeLog b/games-fps/ut2003-data/ChangeLog
index 7929cd9a477f..b8bbb05e836d 100644
--- a/games-fps/ut2003-data/ChangeLog
+++ b/games-fps/ut2003-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/ut2003-data
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-data/ChangeLog,v 1.7 2006/10/24 23:04:38 wolf31o2 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-data/ChangeLog,v 1.8 2008/02/15 01:32:55 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  ut2003-data-2107.ebuild:
+  Fix quoting and some minor cleanups.
 
   24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   ut2003-data-2107.ebuild:
diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107.ebuild
index cf758f681053..7599d1387ee3 100644
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-data/ut2003-data-2107.ebuild,v 1.7 2006/10/24 23:04:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-data/ut2003-data-2107.ebuild,v 1.8 2008/02/15 01:32:55 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -18,11 +18,11 @@ DEPEND="virtual/libc
 	app-arch/unzip
 	games-util/uz2unpack"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
 GAMES_LICENSE_CHECK="yes"
-dir="${GAMES_PREFIX_OPT}/ut2003"
-Ddir="${D}/${dir}"
+dir=${GAMES_PREFIX_OPT}/ut2003
+Ddir=${D}/${dir}
 
 pkg_setup() {
 	games_pkg_setup
@@ -32,95 +32,96 @@ pkg_setup() {
 src_unpack() {
 	cdrom_get_cds System/Packages.md5 StaticMeshes/AWHardware.usx.uz2 \
 		Extras/MayaPLE/Maya4PersonalLearningEditionEpic.exe
-	unzip ${DISTDIR}/UT2003CrashFix.zip \
+	unzip "${DISTDIR}"/UT2003CrashFix.zip \
 		|| die "unpacking crash-fix"
 }
 
 src_install() {
-	dodir ${dir}/System
+	insinto "${dir}"
 	# Disk 1
 	einfo "Copying files from Disk 1..."
-	cp -r ${CDROM_ROOT}/{Animations,ForceFeedback,KarmaData,Maps,Sounds,Textures,Web} ${Ddir} || die "copying files"
-	cp -r ${CDROM_ROOT}/System/{editorres,*.{bmp,dat,det,est,frt,ini,int,itt,md5,u,upl,url}} ${Ddir}/System || die "copying files"
-	insinto ${dir}/Benchmark/Stuff
-	cp -r ${CDROM_ROOT}/Benchmark/Stuff/* ${Ddir}/Benchmark/Stuff \
-		|| die "copying benchmark files"
+	doins -r "${CDROM_ROOT}"/{Animations,ForceFeedback,KarmaData,Maps,Sounds,Textures,Web} || die "copying files"
+	insinto "${dir}"/System
+	doins -r "${CDROM_ROOT}"/System/{editorres,*.{bmp,dat,det,est,frt,ini,int,itt,md5,u,upl,url}} || die "copying files"
+	insinto "${dir}"/Benchmark/Stuff
+	doins -r "${CDROM_ROOT}"/Benchmark/Stuff/* || die "copying benchmark files"
 	cdrom_load_next_cd
 
 	# Disk 2
+	insinto "${dir}"
 	einfo "Copying files from Disk 2..."
-	cp -r ${CDROM_ROOT}/{Music,Sounds,StaticMeshes,Textures} ${Ddir} \
+	doins -r "${CDROM_ROOT}"/{Music,Sounds,StaticMeshes,Textures} \
 		|| die "copying files"
 	cdrom_load_next_cd
 
 	# Disk 3
 	einfo "Copying files from Disk 3..."
-	cp -r ${CDROM_ROOT}/Sounds ${Ddir}|| die "copying files"
+	doins -r "${CDROM_ROOT}"/Sounds || die "copying files"
 
-	unpack_makeself ${CDROM_ROOT}/linux_installer.sh \
+	# TODO: move this to src_unpack, where it belongs
+	unpack_makeself "${CDROM_ROOT}"/linux_installer.sh \
 		|| die "unpacking linux installer"
-	tar xf ${S}/ut2003lnxbins.tar \
+	tar xf "${S}"/ut2003lnxbins.tar \
 		|| die "unpacking original binaries/libraries"
 
 	# create empty files in Benchmark
 	for j in {CSVs,Logs,Results} ; do
-		mkdir -p ${Ddir}/Benchmark/${j} || die "creating folders"
-		touch ${Ddir}/Benchmark/${j}/DO_NOT_DELETE.ME || die "creating files"
+		mkdir -p "${Ddir}"/Benchmark/${j} || die "creating folders"
+		touch "${Ddir}"/Benchmark/${j}/DO_NOT_DELETE.ME || die "creating files"
 	done
 
 	# Cleaning up our installation
-	rm ${Ddir}/System/{Build,Def{ault,User},Manifest,UT2003,User}.ini \
+	rm "${Ddir}"/System/{Build,Def{ault,User},Manifest,UT2003,User}.ini \
 		|| die "deleting ini files"
-	rm -f ${Ddir}/System/{Core,Engine,Setup,UnrealGame,Window,XGame,XInterface,XWeapons}.{det,est,frt,int,itt,u} || die "deleting files that have been patched"
-	rm -rf ${Ddir}/Web/ServerAdmin || die "deleting server admin web pages"
-	rm -f ${Ddir}/System/{Editor,Fire,IpDrv,UnrealEd,Vehicles,XEffects,XPickups,XWebAdmin}.u || die "removing files that will be coming from the patch"
-	rm -f ${Ddir}/System/{UWeb,XAdmin}.{int,u} || die "removing patched files"
-	rm -f ${Ddir}/System/GamePlay.{det,itt,u} || die "patch files removal"
-	rm -f ${Ddir}/System/XMaps.{det,est} ${Ddir}/System/Xweapons.itt \
+	rm -f "${Ddir}"/System/{Core,Engine,Setup,UnrealGame,Window,XGame,XInterface,XWeapons}.{det,est,frt,int,itt,u} || die "deleting files that have been patched"
+	rm -rf "${Ddir}"/Web/ServerAdmin || die "deleting server admin web pages"
+	rm -f "${Ddir}"/System/{Editor,Fire,IpDrv,UnrealEd,Vehicles,XEffects,XPickups,XWebAdmin}.u || die "removing files that will be coming from the patch"
+	rm -f "${Ddir}"/System/{UWeb,XAdmin}.{int,u} || die "removing patched files"
+	rm -f "${Ddir}"/System/GamePlay.{det,itt,u} || die "patch files removal"
+	rm -f "${Ddir}"/System/XMaps.{det,est} "${Ddir}"/System/Xweapons.itt \
 		|| die "removing unused files"
-	rm -f ${Ddir}/System/Manifest.int ${Ddir}/System/Packages.md5 \
+	rm -f "${Ddir}"/System/Manifest.int "${Ddir}"/System/Packages.md5 \
 		|| die "cleanup"
 
 	# install extra help files
-	insinto ${dir}/Help
-	doins ${S}/Help/Unreal.bmp
+	insinto "${dir}"/Help
+	doins "${S}"/Help/Unreal.bmp
 
 	# install Default and DefUser ini files
-	insinto ${dir}/System
-	doins ${S}/System/Def{ault,User}.ini
+	insinto "${dir}"/System
+	doins "${S}"/System/Def{ault,User}.ini
 
 	# install eula
-	insinto ${dir}
-	doins ${S}/eula/License.int
+	insinto "${dir}"
+	doins "${S}"/eula/License.int
 
 	# copying extra/updater
-	cp -r ${S}/{extras,updater} ${Ddir} || die "copying extras/updater"
-	rm -f ${Ddir}/updater/update || die "removing update"
+	doins -r "${S}"/{extras,updater} || die "copying extras/updater"
+	rm -f "${Ddir}"/updater/update || die "removing update"
 
 	# copy libraries
-	exeinto ${dir}/System
-	doexe ${S}/System/libSDL-1.2.so.0 \
+	exeinto "${dir}"/System
+	doexe "${S}"/System/libSDL-1.2.so.0 \
 		|| die "copying libSDL"
 
 	# uncompressing files
 	einfo "Uncompressing files... this may take a while..."
 	for j in {Animations,Maps,Sounds,StaticMeshes,Textures} ; do
-		games_ut_unpack ${Ddir}/${j} || die "uncompressing files"
+		games_ut_unpack "${Ddir}"/${j} || die "uncompressing files"
 	done
 
 	# installing documentation/icon
-	dodoc ${S}/README.linux || die "dodoc README.linux"
-	newicon ${S}/Unreal.xpm ut2003.xpm || die "copying icon"
-	insinto ${dir}
-	doins ${S}/README.linux ${S}/Unreal.xpm || die "copying readme/icon"
+	dodoc "${S}"/README.linux || die "dodoc README.linux"
+	newicon "${S}"/Unreal.xpm ut2003.xpm || die "copying icon"
+	doins "${S}"/README.linux "${S}"/Unreal.xpm || die "copying readme/icon"
 	# copy ut2003/ucc
-	exeinto ${dir}
-	doexe ${S}/bin/ut2003 ${S}/ucc || die "copying ut2003/ucc"
+	exeinto "${dir}"
+	doexe "${S}"/bin/ut2003 "${S}"/ucc || die "copying ut2003/ucc"
 
 	# Here we apply DrSiN's crash patch
-	cp ${S}/CrashFix/System/crashfix.u ${Ddir}/System
+	cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System
 
-	ed ${Ddir}/System/Default.ini >/dev/null 2>&1 <<EOT
+	ed "${Ddir}"/System/Default.ini >/dev/null 2>&1 <<EOT
 $
 ?Engine.GameInfo?
 a
@@ -132,12 +133,12 @@ EOT
 
 	# Here we apply fix for bug #54726
 	dosed "s:UplinkToGamespy=True:UplinkToGamespy=False:" \
-		${dir}/System/Default.ini
+		"${dir}"/System/Default.ini
 
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find ${Ddir} -exec touch '{}' \;
+	find "${Ddir}" -exec touch '{}' \;
 
 	prepgamesdirs
 }