[DRE-commits] [diaspora-installer] 04/07: run bundle exec for eye

[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 c62e88257feffc576fb354b29c346dfe7d8a3d57
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Aug 28 14:43:23 2015 +0530

    run bundle exec for eye
---
 debian/changelog            | 1 +
 debian/diaspora-common.init | 8 +++++---
 debian/postinst             | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e377c4..1e2a97c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ diaspora-installer (0.5.2.0+debian4) UNRELEASED; urgency=medium
   * Always remove bin symlink
   * Move diaspora.yml and database.yml to /etc to better handle configuration
     changes during upgrades
+  * Run bundle exec for eye
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 13:18:50 +0530
 
diff --git a/debian/diaspora-common.init b/debian/diaspora-common.init
index 5368e11..535a77a 100644
--- a/debian/diaspora-common.init
+++ b/debian/diaspora-common.init
@@ -36,6 +36,9 @@ STARTUP_TIMEOUT=100
 . /lib/init/vars.sh
 . /lib/lsb/init-functions
 
+# Run commands from DIASPORA_HOME
+cd ${DIASPORA_HOME}
+
 check_unicorn() {
     pgrep -f "unicorn master"
 }
@@ -74,7 +77,6 @@ do_start()
         return 1
     fi
     
-    cd $DIASPORA_HOME
     sudo -u $USER -E -H $STARTSCRIPT >> $LOGFILE 2>&1  &
     if  [ $? -gt 0 ]
     then
@@ -101,7 +103,7 @@ do_start()
 
 do_stop()
 {
-    sudo -u $USER -E -H eye stop diaspora
+    sudo -u $USER -E -H bundle exec eye stop diaspora
 
     for i in `check_eye`; do
         [ "$VERBOSE" != no ] && log_action_msg "Killing eye with PID $i"
@@ -144,7 +146,7 @@ case "$1" in
     else
         for i in `check_eye`; do
             log_action_msg " Found eye with PID $i"
-            sudo -u $USER -E -H eye info diaspora
+            sudo -u $USER -E -H bundle exec eye info diaspora
         done
     fi
 
diff --git a/debian/postinst b/debian/postinst
index 5a98303..1bc36cf 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -41,7 +41,7 @@ migrate() {
 install_gems() {
 # Needs latest bundler
 # Needs eye for init script
-        gem install --conservative bundler eye
+        gem install --conservative bundler
 }
 
 case "$1" in

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