[DRE-commits] [diaspora-installer] 01/01: handle eye separately for installer

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora-installer.

commit a28edc39037411ac48ef7c5a579457bb2bfb357b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Aug 28 23:12:46 2015 +0530

    handle eye separately for installer
---
 debian/changelog            |  3 ++-
 debian/diaspora-common.init | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8f7472..617a4d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 diaspora-installer (0.5.2.0+debian5) UNRELEASED; urgency=medium
 
-  * Start diaspora with restart if not running 
+  * Start diaspora with restart if not running
+  * Handle eye separately for diaspora and diaspora-installer
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 23:01:01 +0530
 
diff --git a/debian/diaspora-common.init b/debian/diaspora-common.init
index 8191c41..bb34dce 100644
--- a/debian/diaspora-common.init
+++ b/debian/diaspora-common.init
@@ -36,6 +36,13 @@ STARTUP_TIMEOUT=100
 . /lib/init/vars.sh
 . /lib/lsb/init-functions
 
+if test -d ${DIASPORA_HOME}/vendor/bundle
+then
+  EYE="bundle exec eye"
+else
+  EYE="eye"
+fi
+ 
 # Run commands from DIASPORA_HOME
 cd ${DIASPORA_HOME}
 
@@ -103,7 +110,7 @@ do_start()
 
 do_stop()
 {
-    sudo -u $USER -E -H bundle exec eye stop diaspora
+    sudo -u $USER -E -H ${EYE} stop diaspora
 
     for i in `check_eye`; do
         [ "$VERBOSE" != no ] && log_action_msg "Killing eye with PID $i"
@@ -146,7 +153,7 @@ case "$1" in
     else
         for i in `check_eye`; do
             log_action_msg " Found eye with PID $i"
-            sudo -u $USER -E -H bundle exec eye info diaspora
+            sudo -u $USER -E -H ${EYE} info diaspora
         done
     fi
 
@@ -161,7 +168,7 @@ case "$1" in
     else
         for i in `check_eye`; do
             log_action_msg "Found eye with PID $i"
-            sudo -u $USER -E -H bundle exec eye restart diaspora
+            sudo -u $USER -E -H ${EYE} restart diaspora
         done
     fi
     ;;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git