Cluster Project branch, master, updated. cluster-2.99.03-10-g1e1bf34

[mgrac at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1e1bf34e411185164b3d93d5ef94fa0d944b971c

The branch, master has been updated
       via  1e1bf34e411185164b3d93d5ef94fa0d944b971c (commit)
      from  975ce1c9f317882e782126ff742703991495fc8b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1e1bf34e411185164b3d93d5ef94fa0d944b971c
Author: Marek 'marx' Grac <mgrac@redhat.com>
Date:   Thu Jun 5 17:44:33 2008 +0200

    Fixes #445662: names of resources with spaces are mishandled

-----------------------------------------------------------------------

Summary of changes:
 rgmanager/src/resources/named.sh      |    4 ++--
 rgmanager/src/resources/postgres-8.sh |    6 +++---
 rgmanager/src/resources/samba.sh      |   10 +++++-----
 rgmanager/src/resources/tomcat-5.sh   |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/rgmanager/src/resources/named.sh b/rgmanager/src/resources/named.sh
index b9dec73..8a8c2f4 100755
--- a/rgmanager/src/resources/named.sh
+++ b/rgmanager/src/resources/named.sh
@@ -87,9 +87,9 @@ generate_config_file()
 	clog_generate_config $CLOG_INIT "$original_file" "$generated_file"
 
 	generate_configTemplate "$generated_file" "$1"
-	cat $original_file | grep -v "^[[:space:]]*listen-on" | \
+	cat "$original_file" | grep -v "^[[:space:]]*listen-on" | \
 		grep -v "^[[:space:]]*pid-file" | \
-		grep -v "^[[:space:]]*directory" >> $generated_file
+		grep -v "^[[:space:]]*directory" >> "$generated_file"
 
 	declare tmp_file=`mktemp -t cluster.XXXXXXXXXX`
 	mv "$generated_file" "$tmp_file"
diff --git a/rgmanager/src/resources/postgres-8.sh b/rgmanager/src/resources/postgres-8.sh
index 23d151e..3d58dd5 100755
--- a/rgmanager/src/resources/postgres-8.sh
+++ b/rgmanager/src/resources/postgres-8.sh
@@ -102,10 +102,10 @@ generate_config_file()
 	done
 
 	generate_configTemplate "$generated_file" "$1"
-	echo "external_pid_file = '$PSQL_pid_file'" >> $generated_file
-	echo "listen_address = '$ip_comma'" >> $generated_file
+	echo "external_pid_file = '$PSQL_pid_file'" >> "$generated_file"
+	echo "listen_address = '$ip_comma'" >> "$generated_file"
 
-	echo >> $generated_file	
+	echo >> "$generated_file"	
 	sed 's/^[[:space:]]*external_pid_file/### external_pid_file/i;s/^[[:space:]]*listen_address/### listen_address/i' < "$original_file" >> "$generated_file"
 	
         sha1_addToFile "$generated_file"
diff --git a/rgmanager/src/resources/samba.sh b/rgmanager/src/resources/samba.sh
index 4b5c41f..773bc83 100755
--- a/rgmanager/src/resources/samba.sh
+++ b/rgmanager/src/resources/samba.sh
@@ -89,11 +89,11 @@ generate_config_file()
 
 	generate_configTemplate "$generated_file" "$1"
 
-	echo "pid directory = \"$SAMBA_pid_dir\"" >> $generated_file
-	echo "interfaces = $ip_addresses" >> $generated_file
-	echo "bind interfaces only = Yes" >> $generated_file
-	echo "netbios name = \"$OCF_RESKEY_name\"" >> $generated_file
-	echo >> $generated_file	
+	echo "pid directory = \"$SAMBA_pid_dir\"" >> "$generated_file"
+	echo "interfaces = $ip_addresses" >> "$generated_file"
+	echo "bind interfaces only = Yes" >> "$generated_file"
+	echo "netbios name = \"$OCF_RESKEY_name\"" >> "$generated_file"
+	echo >> "$generated_file"	
 	sed 's/^[[:space:]]*pid directory/### pid directory/i;s/^[[:space:]]*interfaces/### interfaces/i;s/^[[:space:]]*bind interfaces only/### bind interfaces only/i;s/^[[:space:]]*netbios name/### netbios name/i' \
 	     < "$original_file" >> "$generated_file"
 	
diff --git a/rgmanager/src/resources/tomcat-5.sh b/rgmanager/src/resources/tomcat-5.sh
index d1bb17c..a0f5109 100755
--- a/rgmanager/src/resources/tomcat-5.sh
+++ b/rgmanager/src/resources/tomcat-5.sh
@@ -212,7 +212,7 @@ start()
 		return $OCF_ERR_GENERIC
 	fi
 	
-	echo $! > $TOMCAT_pid_file
+	echo $! > "$TOMCAT_pid_file"
 
 	clog_service_start $CLOG_SUCCEED
 


hooks/post-receive
--
Cluster Project