ref: refs/heads/master
commit 7de4593b8fa315a8c347c75a1cf43b00142ccad5
Author: Jiří Šrain
Date: Fri Jul 24 10:15:05 2009 +0200
avoid checking process id of the init script itself
---
webclient/package/yastwc | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/webclient/package/yastwc b/webclient/package/yastwc
index 03f5ba0..44efd72 100755
--- a/webclient/package/yastwc
+++ b/webclient/package/yastwc
@@ -129,12 +129,12 @@ PID_FILE=/var/run/yastwc.pid
IGNORE_FILE=/var/run/yastws.pid
#only for beeing sure....
-if ps -C yastwc >/dev/null; then
- ps -C yastwc|grep yastwc|cut -c -6 >$PID_FILE
+SCRIPT_PID=$$
+if ps -C yastwc |grep -v $SCRIPT_PID >/dev/null; then
+ ps -C yastwc |grep -v $SCRIPT_PID |grep yastwc|cut -c -6 >$PID_FILE
PID_FILE_SIZE="$(stat -c "%s" $PID_FILE)"
PID_FILE_ENTRIES="$(wc -l $PID_FILE|cut -c -1)"
if [ $PID_FILE_SIZE -eq 0 ]; then
- echo "$PID_FILE has no entry --> removing"
rm $PID_FILE
fi
else
@@ -142,12 +142,11 @@ else
rm $PID_FILE
fi
fi
-if ps -C yastws >/dev/null; then
- ps -C yastws|grep yastws|cut -c -6 >$IGNORE_FILE
+if ps -C yastws |grep -v $SCRIPT_PID >/dev/null; then
+ ps -C yastws |grep -v $SCRIPT_PID |grep yastws|cut -c -6 >$IGNORE_FILE
IGNORE_FILE_SIZE="$(stat -c "%s" $IGNORE_FILE)"
IGNORE_FILE_ENTRIES="$(wc -l $IGNORE_FILE|cut -c -1)"
if [ $IGNORE_FILE_SIZE -eq 0 ]; then
- echo "$IGNORE_FILE has no entry --> removing"
rm $IGNORE_FILE
fi
else
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
