diff options
| author | Victor Kulichenko <onclev@gmail.com> | 2013-10-28 01:40:12 +0400 |
|---|---|---|
| committer | Victor Kulichenko <onclev@gmail.com> | 2013-10-28 01:40:12 +0400 |
| commit | fc56033ac98873ae66a7e518923a836e8eef8065 (patch) | |
| tree | ef0724395701ade961744499eca2625432fc16fe /init.d | |
| parent | fb42c7e202502df1fc5e4a99d2c8237c7549f6aa (diff) | |
| parent | 3a9175776260c6a53a9f4b8e265191c0c18fbf60 (diff) | |
Merge branch 'vk.unclev.ru'
Conflicts:
.gitignore
init.d/vk4xmpp
Diffstat (limited to 'init.d')
| -rw-r--r-- | init.d/vk4xmpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/init.d/vk4xmpp b/init.d/vk4xmpp index d289b99..991c9f9 100644 --- a/init.d/vk4xmpp +++ b/init.d/vk4xmpp @@ -56,8 +56,12 @@ 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$) |