jonas: Quote variables. Use test options -n and -z.

1 files changed, 20 insertions, 20 deletions

diff --git a/hook-functions b/hook-functions
index cb424d4..32a7e5f 100644
--- a/hook-functions
+++ b/hook-functions
@@ -7,13 +7,13 @@ catenate_cpiogz() {
 		return
 	fi
 
-	cat "${1}" >>${__TMPCPIOGZ}
+	cat "${1}" >>"${__TMPCPIOGZ}"
 }
 
 force_load()
 {
 		manual_add_modules ${@}
-		echo ${@} >>${DESTDIR}/conf/modules
+		echo ${@} >>"${DESTDIR}/conf/modules"
 }
 
 # Takes a file containing a list of modules to be added as an
@@ -34,7 +34,7 @@ add_modules_from_file()
 	fi
 
 	sed -e '/^#/d' ${1} | while read module rest; do
-		force_load ${module} "${rest}"
+		force_load "${module}" "${rest}"
 	done
 }
 
@@ -42,21 +42,21 @@ manual_add_modules()
 {
 	for mam_x in $(modprobe --set-version=${version} --show-depends ${1} 2>/dev/null | awk '{ print $2 }'); do
 		# Prune duplicates
-		if [ -e ${DESTDIR}/${mam_x} ]; then
+		if [ -e "${DESTDIR}/${mam_x}" ]; then
 			continue
 		fi
 
-		mkdir -p ${DESTDIR}/$(dirname ${mam_x})
-		ln -s ${mam_x} ${DESTDIR}/$(dirname ${mam_x})
+		mkdir -p "${DESTDIR}/$(dirname "${mam_x}")"
+		ln -s "${mam_x}" "${DESTDIR}/$(dirname "${mam_x}")"
 	done
 }
 
 # Copy entire subtrees to the initramfs
 copy_modules_dir()
 {
-	tmpdir_modbase=${DESTDIR}/lib/modules/${version}
-	mkdir -p $(dirname ${tmpdir_modbase}/${1})
-	cp -a ${MODULESDIR}/${1} ${tmpdir_modbase}/${1}
+	tmpdir_modbase="${DESTDIR}/lib/modules/${version}"
+	mkdir -p "$(dirname "${tmpdir_modbase}/${1}")"
+	cp -a "${MODULESDIR}/${1}" "${tmpdir_modbase}/${1}"
 }
 
 dep_add_modules()
@@ -64,24 +64,24 @@ dep_add_modules()
 
 	# Things that are too hard to autodetect.
 	for x in md raid0 raid1 raid5 raid6 ext2 ext3 isofs jfs nfs reiserfs xfs af_packet dm_mod; do
-		manual_add_modules ${x}
+		manual_add_modules "${x}"
 	done
 
 	for x in /sys/bus/pci/devices/*; do
-		if [ -e ${x}/modalias ]; then
-			manual_add_modules $(cat ${x}/modalias)
+		if [ -e "${x}/modalias" ]; then
+			manual_add_modules $(cat "${x}/modalias")
 		fi
 	done
 
 	for x in /sys/bus/usb/devices/*; do
-		if [ -e ${x}/modalias ]; then
-			manual_add_modules $(cat ${x}/modalias)
+		if [ -e "${x}/modalias" ]; then
+			manual_add_modules $(cat "${x}/modalias")
 		fi
 	done
 
 	if [ -e /proc/ide ]; then
 		for x in ide-generic ide-disk ide-cd; do
-			manual_add_modules ${x}
+			manual_add_modules "${x}"
 		done
 	fi
 
@@ -100,27 +100,27 @@ auto_add_modules()
 {
 	# base
 	for x in md raid0 raid1 raid5 raid6 ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 ext3 isofs jfs nfs reiserfs xfs af_packet dm_mod; do
-		manual_add_modules ${x}
+		manual_add_modules "${x}"
 	done
 
 	# Ethernet
 	for x in 3c59x 8139cp 8139too 8390 b44 bmac bnx2 defxx dl2k e1000 e100 epic100 eql fealnx famachi forcedeth hp100 mace mv643xx_eth natsemi ne2k-pci netconsole ns83820 pcnet32 r8169 s2io sis900 skge slhc starfire sundance sungem sungem_phy sunhme tg3 tlan de2104x de4x5 dmfe tulip winbond-840 xircom_cb xircom_tulip_cb typhon via-rhine via-velocity yellowfin; do
-		manual_add_modules ${x}
+		manual_add_modules "${x}"
 	done
 
 	# ide
 	for x in ide-cd ide-disk ide-generic aec62xx alim15x3 amd74xx atiixp atuuxo cmd64x cs5520 cs5530 cy82c693 generic hpt34x hpt366 ns87415 opti621 pdc202xx_new pdc202xx_old piix rz1000 sc1200 serverworks siimage sis5513 slc82c105 slc90e66 triflex trm290 via82cxxx; do
-		manual_add_modules ${x}
+		manual_add_modules "${x}"
 	done
 
 	# scsi
 	for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic cciss ch dc395x dmx3191d dpt_i2o eata fdomain ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 megaraid megaraid_mbox megaraid_mm mesh mptscsih nsp32 osst qla1280 qla2100 qla2200 qla2300 qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_promise sata_nv sata_qstor sata_sil sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc scsi_mod scsi_transport_fc scsi_transport_iscsi scsi_transport_spi sd_mod sym53c8xx tmscsim; do
-		manual_add_modules ${x}
+		manual_add_modules "${x}"
 	done
 
 	# i2o
 	for x in i2o_block; do
-		manual_add_modules ${x}
+		manual_add_modules "${x}"
 	done
 
 }