Declare some variables as local, add some quotes.

(Portage version: 2.1.4_rc4)

5 files changed, 29 insertions, 17 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 1fd8f4be6cf6..24880e1e6dae 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.219 2007/12/01 01:12:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.220 2007/12/02 20:00:52 ulm Exp $
+
+  02 Dec 2007; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r4.ebuild,
+  emacs-21.4-r12.ebuild, emacs-21.4-r14.ebuild, emacs-22.1-r3.ebuild:
+  Declare some variables as local, add some quotes.
 
   01 Dec 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r3.ebuild:
   Rename site-init file for USE=source.
diff --git a/app-editors/emacs/emacs-18.59-r4.ebuild b/app-editors/emacs/emacs-18.59-r4.ebuild
index 99cc82cbee50..0c156b71b314 100644
--- a/app-editors/emacs/emacs-18.59-r4.ebuild
+++ b/app-editors/emacs/emacs-18.59-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild,v 1.6 2007/11/03 16:14:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild,v 1.7 2007/12/02 20:00:52 ulm Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -60,6 +60,8 @@ src_compile() {
 }
 
 src_install() {
+	local i
+
 	dodir ${MY_BASEDIR}
 	dodir /usr/share/man/man1
 	make install LIBDIR="${D}${MY_BASEDIR}" BINDIR="${D}/usr/bin" \
diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild
index 04683cbbe9f9..6b354efb262f 100644
--- a/app-editors/emacs/emacs-21.4-r12.ebuild
+++ b/app-editors/emacs/emacs-21.4-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.33 2007/10/14 08:34:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.34 2007/12/02 20:00:52 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -128,9 +128,11 @@ src_compile() {
 }
 
 src_install() {
+	local i m
+
 	einstall || die "einstall failed"
 	for i in "${D}"/usr/bin/* ; do
-		mv ${i} ${i}-emacs-${SLOT} || die "mv ${i} failed"
+		mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed"
 	done
 	mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed"
 	rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
@@ -140,14 +142,14 @@ src_install() {
 	mv "${D}/usr/share/info/dir" "${T}"
 	for i in "${D}"/usr/share/info/*
 	do
-		mv ${i} "${T}"/emacs-${SLOT}/${i##*/}.info
+		mv "${i}" "${T}/emacs-${SLOT}/${i##*/}.info"
 	done
 	mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
 	mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}"
 
 	einfo "Fixing manpages..."
 	for m in "${D}"/usr/share/man/man1/* ; do
-		mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv ${m} failed"
+		mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed"
 	done
 
 	# avoid collision between slots
@@ -173,7 +175,7 @@ emacs-infodir-rebuild() {
 	rm -f "${ROOT}"${infodir}/dir{,.*}
 	for f in "${ROOT}"${infodir}/*.info*; do
 		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null
+			|| install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
 	done
 	echo
 }
diff --git a/app-editors/emacs/emacs-21.4-r14.ebuild b/app-editors/emacs/emacs-21.4-r14.ebuild
index e4ee033eafe7..caca20078b21 100644
--- a/app-editors/emacs/emacs-21.4-r14.ebuild
+++ b/app-editors/emacs/emacs-21.4-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.7 2007/11/28 19:38:23 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.8 2007/12/02 20:00:52 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -112,9 +112,11 @@ src_compile() {
 }
 
 src_install() {
+	local i m
+
 	einstall || die "einstall failed"
 	for i in "${D}"/usr/bin/* ; do
-		mv ${i} ${i}-emacs-${SLOT} || die "mv ${i} failed"
+		mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed"
 	done
 	mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed"
 	rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
@@ -124,14 +126,14 @@ src_install() {
 	mv "${D}/usr/share/info/dir" "${T}"
 	for i in "${D}"/usr/share/info/*
 	do
-		mv ${i} "${T}"/emacs-${SLOT}/${i##*/}.info
+		mv "${i}" "${T}/emacs-${SLOT}/${i##*/}.info"
 	done
 	mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
 	mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}"
 
 	einfo "Fixing manpages..."
 	for m in "${D}"/usr/share/man/man1/* ; do
-		mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv ${m} failed"
+		mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed"
 	done
 
 	# avoid collision between slots
@@ -157,7 +159,7 @@ emacs-infodir-rebuild() {
 	rm -f "${ROOT}"${infodir}/dir{,.*}
 	for f in "${ROOT}"${infodir}/*.info*; do
 		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null
+			|| install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
 	done
 	echo
 }
diff --git a/app-editors/emacs/emacs-22.1-r3.ebuild b/app-editors/emacs/emacs-22.1-r3.ebuild
index efc9bfead708..818dd7caf0fe 100644
--- a/app-editors/emacs/emacs-22.1-r3.ebuild
+++ b/app-editors/emacs/emacs-22.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.9 2007/12/01 01:12:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.10 2007/12/02 20:00:52 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -151,6 +151,8 @@ src_compile() {
 }
 
 src_install () {
+	local i m
+
 	emake install DESTDIR="${D}" || die "make install failed"
 
 	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \
@@ -161,13 +163,13 @@ src_install () {
 	# move info documentation to the correct place
 	einfo "Fixing info documentation ..."
 	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
-		mv ${i} ${i}.info || die "mv info failed"
+		mv "${i}" "${i}.info" || die "mv info failed"
 	done
 
 	# move man pages to the correct place
 	einfo "Fixing manpages ..."
 	for m in "${D}"/usr/share/man/man1/* ; do
-		mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed"
+		mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv man failed"
 	done
 
 	# avoid collision between slots, see bug #169033 e.g.
@@ -204,7 +206,7 @@ emacs-infodir-rebuild() {
 	rm -f "${ROOT}"${infodir}/dir{,.*}
 	for f in "${ROOT}"${infodir}/*.info*; do
 		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null
+			|| install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
 	done
 	echo
 }
@@ -215,7 +217,7 @@ pkg_postinst() {
 
 	local f
 	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		test -e ${f} || touch ${f}
+		test -e "${f}" || touch "${f}"
 	done
 
 	elisp-site-regen