Fixed up some quoting issues and remove eindent command, #129774.

Package-Manager: portage-2.1_pre7-r5

3 files changed, 31 insertions, 15 deletions

diff --git a/net-ftp/ftpbase/ChangeLog b/net-ftp/ftpbase/ChangeLog
index 5cc0929bf53f..29a10221f628 100644
--- a/net-ftp/ftpbase/ChangeLog
+++ b/net-ftp/ftpbase/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-ftp/ftpbase
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ChangeLog,v 1.10 2005/10/05 17:27:33 uberlord Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ChangeLog,v 1.11 2006/04/13 07:26:11 uberlord Exp $
+
+  13 Apr 2006; Roy Marples <uberlord@gentoo.org> ftpbase-0.00.ebuild:
+  Fixed up some quoting issues and remove eindent command, #129774.
 
   05 Oct 2005; Roy Marples <uberlord@gentoo.org> ftpbase-0.00.ebuild:
   Use "egethome ftp" instead of greping and cuting /etc/passwd.
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index 70807389c761..a538f5277179 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,7 +1,21 @@
-MD5 f0a3353a62fd60ef2a14f9aa6c0b15ac ChangeLog 1705
-MD5 1e5344b37b02008f08173928774ca16b ftpbase-0.00.ebuild 2416
-MD5 f545d2bcdb5641a7863b64be435382e2 metadata.xml 285
+MD5 f738fef4ac5d4ed492c6aee11ab346eb ChangeLog 1844
+RMD160 084ad637fcc6983e07e34f1d1957c825b886911f ChangeLog 1844
+SHA256 85b8f58a9a31bd62ad2acb065cedc4e5b1d6226aa6baaeca083124855b0311ef ChangeLog 1844
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ftpbase-0.00 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ftpbase-0.00 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ftpbase-0.00 0
 MD5 7be20c7c1b62bb7e65994bd7a686695e files/ftp-pamd 807
+RMD160 1dce921bb3045aca3f4d57f4bc70f804f49d91cb files/ftp-pamd 807
+SHA256 c378eaaa16ca300bb828256d68807cf6f84751ae3ef9192186cf16bef89076dc files/ftp-pamd 807
 MD5 9e7d64873559cebdc60ee1d0d7845ce7 files/ftp-pamd-include 747
+RMD160 086aa9c0e1b0f23f8792a9da32038efc1a92cf7a files/ftp-pamd-include 747
+SHA256 b6194c655619343e5908517a50a615b1b028181ea09280ec87dea23f6c10e9a6 files/ftp-pamd-include 747
 MD5 bd59faca8d7138ac67e99d94507b04f9 files/ftpusers 407
+RMD160 46a48b5ab2c51b4062b62a424bd88a244bb08445 files/ftpusers 407
+SHA256 34360cd3a4700e8c03aa08d1a5c3f217bb58b5e935950e14868f5ff8d32e52bc files/ftpusers 407
+MD5 fa696def13dc7bc40baaf38907ff076d ftpbase-0.00.ebuild 2412
+RMD160 11a53c4275d027b29fc47746239c8c72c83c69b9 ftpbase-0.00.ebuild 2412
+SHA256 8f3a55421f02f546fad6fed93647f845ef8cec0fb996ebbe434156686d49c49b ftpbase-0.00.ebuild 2412
+MD5 f545d2bcdb5641a7863b64be435382e2 metadata.xml 285
+RMD160 9fa8650f53cc524dcc1763c7c630aca84040d9f1 metadata.xml 285
+SHA256 92e92b69d385b8b3157739ea7a426bcdf0210b4e48244da661656e3f89fd4241 metadata.xml 285
diff --git a/net-ftp/ftpbase/ftpbase-0.00.ebuild b/net-ftp/ftpbase/ftpbase-0.00.ebuild
index 0390ce7b59b1..c400f44a0d07 100644
--- a/net-ftp/ftpbase/ftpbase-0.00.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ftpbase-0.00.ebuild,v 1.12 2005/10/05 17:27:33 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ftpbase-0.00.ebuild,v 1.13 2006/04/13 07:26:11 uberlord Exp $
 
 inherit eutils pam
 
@@ -18,20 +18,19 @@ DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
 	!<net-ftp/pure-ftpd-1.0.20-r2
 	!<net-ftp/vsftpd-2.0.3-r1"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 check_collision() {
-	[[ ! -e ${1} ]] && return 0
+	[[ ! -e "$1" ]] && return 0
 
-	[[ $( head -n 1 "${1}" ) == $( head -n 1 "${2}" ) ]] && return 0
+	[[ $( head -n 1 "$1" ) == "$( head -n 1 "$2" )" ]] && return 0
 
-	eerror "${1} exists and was not provided by ${P}"
+	eerror "   $1 exists and was not provided by ${P}"
 	return 1
 }
 
 pkg_setup() {
 	ebegin "Checking for possible file collisions..."
-	eindent
 
 	local collide=false
 	check_collision /etc/ftpusers "${FILESDIR}/ftpusers" || collide=true
@@ -47,7 +46,7 @@ pkg_setup() {
 		echo
 		ewarn "If you edited them, remember to backup and when restoring make"
 		ewarn " sure the first line in each file is:"
-		einfo $( head -n 1 "${FILESDIR}/ftpusers" )
+		einfo "$( head -n 1 "${FILESDIR}/ftpusers" )"
 		eend 1
 		die "Can't be installed, files will collide"
 	fi
@@ -83,8 +82,8 @@ pkg_postinst() {
 	# Install manually using install -d until bug #9849 is solved.
 	# This means that the home directory will not be removed when we uninstall
 	# if it's empty.
-	local homedir=$( egethome ftp )
-	if [[ ! -d ${homedir} ]]; then
+	local homedir="$(egethome ftp)"
+	if [[ ! -d "${homedir}" ]]; then
 		einfo "Creating home directory for ftp user"
 		einfo "   ${homedir}"
 		install -d "${homedir}" \