Commit 1c0d68d1 authored by Pavel Vaynerman's avatar Pavel Vaynerman

minor fixes in scripts

parent 71b0da8b
...@@ -64,7 +64,7 @@ function set_omni ...@@ -64,7 +64,7 @@ function set_omni
OMNIPORT=$(expr $USERID + $BASEOMNIPORT) OMNIPORT=$(expr $USERID + $BASEOMNIPORT)
if [ $(grep "$OMNIPORT/" /etc/services | wc -l) \> 0 ] if [ $(grep -q "$OMNIPORT/" /etc/services | wc -l) \> 0 ]
then then
if [ $USERID = 0 ] if [ $USERID = 0 ]
then then
...@@ -86,9 +86,9 @@ function runOmniNames() ...@@ -86,9 +86,9 @@ function runOmniNames()
RETVAL=1 RETVAL=1
omniTest=0 omniTest=0
if [ $std = 1 ]; then if [ $std = 1 ]; then
omniTest=$(ps -ax | grep $OMNINAME | grep -v grep | grep -v $0 | wc -l); omniTest=$(ps ax | grep -q $OMNINAME | grep -v grep | grep -v $0 | wc -l);
else else
omniTest=$(ps -aux | grep $OMNINAME | grep $USER | grep -v grep | grep -v $0 | wc -l); omniTest=$(ps aux | grep -q $OMNINAME | grep $USER | grep -v grep | grep -v $0 | wc -l);
fi fi
if [ $omniTest \> 0 ]; if [ $omniTest \> 0 ];
...@@ -120,7 +120,7 @@ function runOmniNames() ...@@ -120,7 +120,7 @@ function runOmniNames()
fi fi
#echo $! $OMNINAME >>$RANSERVICES #echo $! $OMNINAME >>$RANSERVICES
if [ $(grep $OMNINAME $RANSERVICES | wc -l) \= 0 ] if [ $(grep -q $OMNINAME $RANSERVICES | wc -l) \= 0 ]
then then
echo 0 $OMNINAME >>$RANSERVICES echo 0 $OMNINAME >>$RANSERVICES
fi fi
......
...@@ -53,7 +53,7 @@ fi ...@@ -53,7 +53,7 @@ fi
pid=$! pid=$!
echo $pid >$PIDFILE # pid- echo $pid >$PIDFILE # pid-
PROGLINE=$(ps -x | grep $(basename $NAMEPROG) | grep -v $0 | grep -v grep) PROGLINE=$(ps -x | grep -q $(basename $NAMEPROG) | grep -v $0 | grep -v grep)
if [ -n "$PROGLINE" ]; then if [ -n "$PROGLINE" ]; then
RETVAL=1 RETVAL=1
......
...@@ -178,6 +178,9 @@ rm -f %buildroot%_libdir/*.la ...@@ -178,6 +178,9 @@ rm -f %buildroot%_libdir/*.la
%exclude %_pkgconfigdir/libUniSet.pc %exclude %_pkgconfigdir/libUniSet.pc
%changelog %changelog
* Thu Oct 01 2009 Pavel Vainerman <pv@etersoft.ru> 0.97-eter24
- new mutex
* Wed Sep 30 2009 Pavel Vainerman <pv@etersoft.ru> 0.97-eter23 * Wed Sep 30 2009 Pavel Vainerman <pv@etersoft.ru> 0.97-eter23
- control (on/off) new ComPort - control (on/off) new ComPort
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment