[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4780-g323533d

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  323533d798c00797c6c8a317ae72deb06ff7f7af (commit)
       via  8a4b0bba444952c8c5c75b8cdc11da47e7e4ac83 (commit)
      from  39f3af99add8aa1f32bc537fbcb85377d0c41111 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 323533d798c00797c6c8a317ae72deb06ff7f7af
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jan 5 16:33:00 2009 +0100

    examples: Avoid bashism in perfcount.init.
    
    This fixes bug #6000.
    Thanks to the Debian Samba package maintainers for providing the patch!
    Remove trailing whitespaces.
    
    Karolin
    (cherry picked from commit 2e09746a4db4186c9d648370b9004971bc18e5c9)

commit 8a4b0bba444952c8c5c75b8cdc11da47e7e4ac83
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jan 5 16:35:11 2009 +0100

    Revert "examples: Avoid bashism in perfcount.init."
    
    This reverts commit e273c07e94ee607bbf05b6fa66cf3cea13fe4502.

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

Summary of changes:
 examples/perfcounter/perfcountd.init |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/perfcounter/perfcountd.init b/examples/perfcounter/perfcountd.init
index 8a89fad..1a05a69 100755
--- a/examples/perfcounter/perfcountd.init
+++ b/examples/perfcounter/perfcountd.init
@@ -21,17 +21,17 @@
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
-killproc()
+killproc() 
 {
 	pid=`ps aux | grep $1 | egrep -v '(grep|perfcountd)' | awk '{print $2}'`
-	if [ -z "$pid" ]; then
+	if [ x"$pid" != "x" ]; then
 		kill $pid
 	fi
 }
 
-# Start/stop processes
+# Start/stop processes 
 
-case "$1" 
+case "$1"
 in
 start)
 	/opt/samba/bin/perfcount -d -f /var/lib/samba/perfmon 2> /dev/null
@@ -47,7 +47,7 @@ stop)
 
 status)
 	pid=`ps aux | grep perfcount | egrep -v '(grep|perfcountd)' | awk '{print $2}'`
-	if [ "$pid" == "" ]; then
+	if [ x"$pid" = "x" ]; then
 		echo "Dead!"
 		exit 2;
 	fi


-- 
Samba Shared Repository