--- bacula-1.38.9.ebuild.old	2006-08-05 16:58:12.000000000 -0300
+++ bacula-1.38.9.ebuild	2006-08-05 17:31:04.000000000 -0300
@@ -103,11 +103,11 @@
 }
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack "${A}"
+	cd "${S}"
 	# adjusts default configuration files for several binaries
 	# to /etc/bacula/<config> instead of ./<config>
-	epatch ${FILESDIR}/${P}-default-configs.patch
+	epatch "${FILESDIR}/${P}-default-configs.patch"
 }
 
 src_compile() {
@@ -133,7 +133,7 @@
 
 	if ! use bacula-clientonly; then
 		# select database support
-		if [ ${mydb} == "postgresql" ]; then
+		if [ "${mydb}" == "postgresql" ]; then
 			myconf="${myconf} `use_with postgres postgresql`"
 		else
 			myconf="${myconf} `use_with ${mydb}`"
@@ -168,16 +168,16 @@
 		--with-fd-user=root \
 		--with-fd-group=bacula \
 		--enable-smartalloc \
-		--host=${CHOST} ${myconf} || die "Configure failed!"
+		"--host=${CHOST}" ${myconf} || die "Configure failed!"
 
 	emake || die "Failed primary build!"
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "Failed install to ${D} !"
+	emake DESTDIR="${D}" install || die "Failed install to ${D} !"
 
 	if use static ; then
-		cd ${D}/usr/sbin
+		cd "${D}/usr/sbin"
 		mv static-bacula-fd bacula-fd
 		mv static-bconsole bconsole
 		if ! use bacula-clientonly ; then
@@ -187,12 +187,12 @@
 		if use gnome ; then
 			mv static-gnome-console gnome-console
 		fi
-		cd ${S}
+		cd "${S}"
 	fi
 
 	if use bacula-console ; then
 		if use gnome ; then
-			emake DESTDIR=${D} \
+			emake DESTDIR="${D}" \
 				install-menu \
 				install-menu-xsu || die "Failed to install gnome menu files to ${D}" \
 			make_desktop_entry \
@@ -209,7 +209,7 @@
 		dodir /usr/libexec/bacula/updatedb
 		insinto /usr/libexec/bacula/updatedb/
 		insopts -m0754
-		doins ${S}/updatedb/*
+		doins "${S}"/updatedb/*
 		fperms 0640 /usr/libexec/bacula/updatedb/README
 
 		# the logrotate configuration
@@ -218,7 +218,7 @@
 			dodir /etc/logrotate.d
 			insinto /etc/logrotate.d
 			insopts -m0644
-			newins ${S}/scripts/logrotate bacula
+			newins "${S}/scripts/logrotate" bacula
 		fi
 
 		# the logwatch scripts
@@ -227,32 +227,32 @@
 			dodir /etc/log.d/scripts/services
 			dodir /etc/log.d/conf/logfiles
 			dodir /etc/log.d/conf/services
-			cd ${S}/scripts/logwatch
-			emake DESTDIR=${D} install || die "Failed to install logwatch scripts to ${D} !"
-			cd ${S}
+			cd "${S}/scripts/logwatch"
+			emake DESTDIR="${D}" install || die "Failed to install logwatch scripts to ${D} !"
+			cd "${S}"
 		fi
 	fi
 
 	# documentation
-	for my_doc in ${S}/{ChangeLog,LICENSE,README,ReleaseNotes,kernstodo,doc/BaculaRoadMap_*.pdf}
+	for my_doc in "${S}"/{ChangeLog,LICENSE,README,ReleaseNotes,kernstodo,doc/BaculaRoadMap_*.pdf}
 	do
-		dodoc ${my_doc}
+		dodoc "${my_doc}"
 	done
 	if use doc ; then
-		dodoc ${WORKDIR}/${PN}-docs-${DOC_VER}/developers/developers.pdf
-		dodoc ${WORKDIR}/${PN}-docs-${DOC_VER}/manual/bacula.pdf
+		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}/developers/developers.pdf"
+		dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}/manual/bacula.pdf"
 		diropts -m0755
-		dodir /usr/share/doc/${PF}/developers
-		dodir /usr/share/doc/${PF}/manual
+		dodir "/usr/share/doc/${PF}/developers"
+		dodir "/usr/share/doc/${PF}/manual"
 		insopts -m0644
 		insinto /usr/share/doc/${PF}/developers
-		doins ${WORKDIR}/${PN}-docs-${DOC_VER}/developers/developers/*
-		insinto /usr/share/doc/${PF}/manual
-		doins ${WORKDIR}/${PN}-docs-${DOC_VER}/manual/bacula/*
+		doins "${WORKDIR}/${PN}-docs-${DOC_VER}"/developers/developers/*
+		insinto "/usr/share/doc/${PF}/manual"
+		doins "${WORKDIR}/${PN}-docs-${DOC_VER}"/manual/bacula/*
 	fi
 
 	# clean up permissions left broken by install
-	fperms 0644 ${D}/usr/libexec/bacula/query.sql
+	fperms 0644 "${D}/usr/libexec/bacula/query.sql"
 	prepall
 
 	# setup init scripts
@@ -276,16 +276,16 @@
 		my_scripts="bacula-all"
 	fi
 	for script in ${my_scripts}; do
-		cp ${FILESDIR}/${PV}/${script}-conf ${T}/${script}.conf
-		cp ${FILESDIR}/${PV}/${script}-init ${T}/${script}.init
+		cp "${FILESDIR}/${PV}/${script}-conf" "${T}/${script}.conf"
+		cp "${FILESDIR}/${PV}/${script}-init" "${T}/${script}.init"
 		if [ "${mydb}" == "sqlite" ]; then
-			sed -i -e "s:%database%::" ${T}/${script}.init
+			sed -i -e "s:%database%::" "${T}/${script}.init"
 		else
-			sed -i -e "s:%database%:${mydb}:" ${T}/${script}.init
+			sed -i -e "s:%database%:${mydb}:" "${T}/${script}.init"
 		fi
-		sed -i -e "s:%services%:${my_services}:" ${T}/${script}.conf
-		newexe ${T}/${script}.init ${script}
-		newins ${T}/${script}.conf ${script}
+		sed -i -e "s:%services%:${my_services}:" "${T}/${script}.conf"
+		newexe "${T}/${script}.init" "${script}"
+		newins "${T}/${script}.conf" "${script}"
 	done
 
 	# make sure the working directory exists