From 2b866f264fa2ea9cda891018234414c4f4942eb8 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sun, 26 Apr 2009 21:13:26 +0000
Subject: Stop using needless {} in vars

---
 sh/rc-mount.sh | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'sh/rc-mount.sh')

diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh
index 154fe802..8c952f94 100644
--- a/sh/rc-mount.sh
+++ b/sh/rc-mount.sh
@@ -1,4 +1,4 @@
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
+# Copyright 2007-2009 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
 # Declare this here so that no formatting doesn't affect the embedded newline
@@ -7,13 +7,13 @@ __IFS="
 
 # Handy function to handle all our unmounting needs
 # mountinfo is a C program to actually find our mounts on our supported OS's
-# We rely on fuser being preset, so if it's not then we don't unmount anything.
+# We rely on fuser being present, so if it's not then don't unmount anything.
 # This isn't a real issue for the BSD's, but it is for Linux.
 do_unmount()
 {
 	local cmd="$1" retval=0 retry= pids=-
 	local f_opts="-m -c" f_kill="-s " mnt=
-	if [ "${RC_UNAME}" = "Linux" ]; then
+	if [ "$RC_UNAME" = "Linux" ]; then
 		f_opts="-m"
 		f_kill="-"
 	fi
@@ -25,26 +25,26 @@ do_unmount()
 	for mnt; do
 		# Unmounting a shared mount can unmount other mounts, so
 		# we need to check the mount is still valid
-		mountinfo --quiet "${mnt}" || continue
+		mountinfo --quiet "$mnt" || continue
 
-		case "${cmd}" in
+		case "$cmd" in
 			umount)
-				ebegin "Unmounting ${mnt}"
+				ebegin "Unmounting $mnt"
 				;;
 			*)
-				ebegin "Remounting ${mnt} read only"
+				ebegin "Remounting $mnt read only"
 				;;
 		esac
 
 		retry=3
-		while ! LC_ALL=C ${cmd} "${mnt}" 2>/dev/null; do
+		while ! LC_ALL=C $cmd "$mnt" 2>/dev/null; do
 			if type fuser >/dev/null 2>&1; then
-				pids="$(fuser ${f_opts} "${mnt}" 2>/dev/null)"
+				pids="$(fuser $f_opts "$mnt" 2>/dev/null)"
 			fi
-			case " ${pids} " in
+			case " $pids " in
 				*" $$ "*)
 					eend 1 "failed because we are using" \
-					"${mnt}"
+					"$mnt"
 					retry=0;;
 				" - ")
 					eend 1
@@ -54,21 +54,21 @@ do_unmount()
 					retry=0;;
 				*)
 					local sig="KILL"
-					[ ${retry} -gt 0 ] && sig="TERM"
-					fuser ${f_kill}${sig} -k ${f_opts} \
-						"${mnt}" >/dev/null 2>&1
+					[ $retry -gt 0 ] && sig="TERM"
+					fuser $f_kill$sig -k $f_opts \
+						"$mnt" >/dev/null 2>&1
 					sleep 1
-					retry=$((${retry} - 1))
-					[ ${retry} -le 0 ] && eend 1
+					retry=$(($retry - 1))
+					[ $retry -le 0 ] && eend 1
 					;;
 			esac
-			[ ${retry} -le 0 ] && break
+			[ $retry -le 0 ] && break
 		done
-		if [ ${retry} -le 0 ]; then
+		if [ $retry -le 0 ]; then
 			retval=1
 		else
 			eend 0
 		fi
 	done
-	return ${retval}
+	return $retval
 }
-- 
cgit v1.2.3