From d54eb5008a740ad3a8f01e5136e62637f2e236d5 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sun, 5 Aug 2007 22:11:50 -0400
Subject: [PATCH] Stop scaring me with unquoted variables.

svn path=/trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/; revision=63
---
 debian/changelog                                |    6 ++++
 files/etc/remctl/sipb-xen-auto/bin/dispatch.sh  |    6 ++--
 files/etc/remctl/sipb-xen-auto/remctl-update.sh |   42 +++++++++++------------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 95b1504..5a0be9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-remctl-auto (1.0.1) unstable; urgency=low
+
+  * Stop scaring me with unquoted variables.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Sun, 05 Aug 2007 22:11:02 -0400
+
 sipb-xen-remctl-auto (1.0) unstable; urgency=low
 
   * Initial release.
diff --git a/files/etc/remctl/sipb-xen-auto/bin/dispatch.sh b/files/etc/remctl/sipb-xen-auto/bin/dispatch.sh
index 8c62b34..dfc8bd0 100755
--- a/files/etc/remctl/sipb-xen-auto/bin/dispatch.sh
+++ b/files/etc/remctl/sipb-xen-auto/bin/dispatch.sh
@@ -9,13 +9,13 @@
 # $2 and so on are user-provided, and thus sketchy.  I don't think we
 # need them for this script.
 
-ACTION=$(echo $0 | awk -F'.' '{print $2}')
+ACTION=$(echo "$0" | awk -F'.' '{print $2}')
 MACHINE=$1
-echo $ACTION
+echo "$ACTION"
 
 case "$ACTION" in
     reboot|list|vcpu-list|destroy|create|uptime)
-        xm $ACTION $MACHINE
+        xm "$ACTION" "$MACHINE"
         exit 0
 	;;
     *)
diff --git a/files/etc/remctl/sipb-xen-auto/remctl-update.sh b/files/etc/remctl/sipb-xen-auto/remctl-update.sh
index b0a96fb..3999144 100755
--- a/files/etc/remctl/sipb-xen-auto/remctl-update.sh
+++ b/files/etc/remctl/sipb-xen-auto/remctl-update.sh
@@ -13,12 +13,12 @@ ACLDIR=$DIR/acl
 update_machine()
 {
     machine=$1
-    sed "s/#MACHINENAME#/$machine/g" $TEMPLATE | \
-	sed "s,#BINDIR#,$BINDIR,g" >| $MACHINETMP
-    if ! cmp -s $MACHINEDIR/$machine $MACHINETMP; then
-	mv $MACHINETMP $MACHINEDIR/$machine
+    sed "s/#MACHINENAME#/$machine/g" "$TEMPLATE" | \
+	sed "s,#BINDIR#,$BINDIR,g" >| "$MACHINETMP"
+    if ! cmp -s "$MACHINEDIR/$machine" "$MACHINETMP"; then
+	mv "$MACHINETMP" "$MACHINEDIR/$machine"
     else
-	rm -f $MACHINETMP
+	rm -f "$MACHINETMP"
     fi
 }
 
@@ -30,20 +30,18 @@ update_moiragroup()
     # We should do more careful error checking so we don't take away
     # all bits and delete the moira-acl files whenever there's an AFS
     # outage.
-    pts membership system:$group -noauth | tail -n+2 | \
-	sed 's/\./\//' | \
-	sed 's/^  //' | \
-	sed 's/$/@ATHENA.MIT.EDU/g' >| $MOIRATMP
-    if test -s $MOIRATMP; then
-	if ! cmp -s $MOIRADIR/$group $MOIRATMP; then
-	    mv $MOIRATMP $MOIRADIR/$group
+    pts membership -nameorid "system:$group" -noauth | tail -n+2 | \
+	sed 's/\./\//; s/^  //; s/$/@ATHENA.MIT.EDU/g' >| "$MOIRATMP"
+    if test -s "$MOIRATMP"; then
+	if ! cmp -s "$MOIRADIR/$group" "$MOIRATMP"; then
+	    mv "$MOIRATMP" "$MOIRADIR/$group"
 	fi
     else
-	if test -e $MOIRADIR/$group; then
-	    rm $MOIRADIR/$group
+	if test -e "$MOIRADIR/$group"; then
+	    rm "$MOIRADIR/$group"
 	fi
     fi
-    rm -f $MOIRATMP
+    rm -f "$MOIRATMP"
 }
 
 case "$1" in
@@ -53,26 +51,26 @@ case "$1" in
 
     all_machines)
         # update the remctl.conf definitions
-	for machine in `cat $AUTOMACHINELIST`; do
-	    update_machine $machine
+	for machine in `cat "$AUTOMACHINELIST"`; do
+	    update_machine "$machine"
 	done
 	;;
     all_moira)
         # update our moira ACL lists
-	for group in `cat $AUTOMOIRALIST`; do
-	    update_moiragroup $group
+	for group in `cat "$AUTOMOIRALIST"`; do
+	    update_moiragroup "$group"
 	done
 	;;
     auto_machine_list)
         # update the list of maintained machines
-	/bin/ls $ACLDIR >| $AUTOMACHINELIST
+	/bin/ls "$ACLDIR" >| "$AUTOMACHINELIST"
 	;;
     auto_moira_list)
         # update the moira list-of-lists
-        # /bin/ls $MOIRADIR >| $AUTOMOIRALIST # BAD IDEA in case of outage
+        # /bin/ls "$MOIRADIR" >| "$AUTOMOIRALIST" # BAD IDEA in case of outage
 
 	# This extracts the list of all moira lists we care about, and updates those.
-	grep -R moira $ACLDIR/ /etc/remctl/acl/ | perl -pe 's/.*moira-acl\/(.*)/$1/g' >| $AUTOMOIRALIST
+	grep -R moira "$ACLDIR/" /etc/remctl/acl/ | perl -pe 's/.*moira-acl\/(.*)/$1/g' >| "$AUTOMOIRALIST"
 	;;
     all)
     	"$0" auto_machine_list
-- 
1.7.9.5