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

[Karolin Seeger]

The branch, v3-2-test has been updated
       via  de41f0e9a08b796873bdd319fe784b6c90e28b23 (commit)
       via  fbee9f20b30a426d5c336066522d047a504914b9 (commit)
      from  2ad41fedc50f764e77e2ba56b4d53d1045947a9c (commit)

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


- Log -----------------------------------------------------------------
commit de41f0e9a08b796873bdd319fe784b6c90e28b23
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)
    (cherry picked from commit 9b17f7907bca32282d6e56fa28ca62ef84bf7afc)

commit fbee9f20b30a426d5c336066522d047a504914b9
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jan 5 16:37:01 2009 +0100

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

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

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


Changeset truncated at 500 lines:

diff --git a/examples/perfcounter/perfcountd.init b/examples/perfcounter/perfcountd.init
index 8a89fad..0beff96 100755
--- a/examples/perfcounter/perfcountd.init
+++ b/examples/perfcounter/perfcountd.init
@@ -24,14 +24,14 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 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
 
-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