Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mrDoctorWho/vk4xmpp.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/init.d
diff options
context:
space:
mode:
authorVictor Kulichenko <onclev@gmail.com>2013-10-28 01:56:06 +0400
committerVictor Kulichenko <onclev@gmail.com>2013-10-28 01:56:06 +0400
commit08033b7d7692e7f5e39b766658009f0ee26351b6 (patch)
tree2684fe3cd7f487d128d5b5e32570ba482d705484 /init.d
parentfc56033ac98873ae66a7e518923a836e8eef8065 (diff)
LSBInitScript: pid fix
Diffstat (limited to 'init.d')
-rw-r--r--init.d/vk4xmpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/init.d/vk4xmpp b/init.d/vk4xmpp
index 991c9f9..d289b99 100644
--- a/init.d/vk4xmpp
+++ b/init.d/vk4xmpp
@@ -56,12 +56,8 @@ status)
if [[ -f "$PIDFILE" ]]
then
APPPID=$(cat $PIDFILE)
-<<<<<<< HEAD
# fix: added | sed 's/^ *//g' # not obligatory from beginning of a line
ps -eOcmd | sed 's/^ *//g' | grep ^$APPPID >&2
-=======
- ps -eOcmd | grep ^$APPPID >&2
->>>>>>> refs/heads/vk.unclev.ru
else
#echo "$PIDFILE does not exist" >&2
PS=$(ps -eOcmd | grep gateway.py$)