[DRE-commits] [diaspora-installer] 02/08: move config, vendor/bundle and .bundle back

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch 04x-05x_update
in repository diaspora-installer.

commit 464e6f5bdf2566724d9436b1880d8c0c00863608
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue May 19 22:50:09 2015 +0530

    move config, vendor/bundle and .bundle back
---
 debian/preinst | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/preinst b/debian/preinst
index 205bede..ce6cef7 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -30,7 +30,7 @@ case "$1" in
                 echo "Run sidekiq for 5 minutes..."
                 echo "Current time is `date`..."
                 su diaspora -s /bin/sh -c 'bundle exec sidekiq&'
-                sleep 1m
+                sleep 5m
                 echo "Stop sidekiq..."
                 su diaspora -s /bin/sh -c 'pkill -u diaspora -f sidekiq' || true
             fi
@@ -38,18 +38,19 @@ case "$1" in
             # Backup the previous version
             # Just keep the config and vendor/bundle
             backup() {
-                mv ${diaspora_home}/config ${diaspora_home}-config
-                mv ${diaspora_home}/vendor/bundle ${diaspora_home}-vendor-bundle
-                mv ${diaspora_home}/.bundle ${diaspora_home}.bundle
+                cp -r ${diaspora_home}/config ${diaspora_home}-config
+                cp -r ${diaspora_home}/vendor/bundle ${diaspora_home}-vendor-bundle
+                cp -r ${diaspora_home}/.bundle ${diaspora_home}.bundle
                 mv ${diaspora_home} ${diaspora_home}-backup.`openssl rand -hex 4`
                 mkdir ${diaspora_home}
                 mkdir ${diaspora_home}/vendor
-                cp -r ${diaspora_home}-config ${diaspora_home}/config
-                cp -r ${diaspora_home}-vendor-bundle ${diaspora_home}/vendor/bundle
-                cp -r ${diaspora_home}.bundle ${diaspora_home}/.bundle
+                mv ${diaspora_home}-config ${diaspora_home}/config
+                mv ${diaspora_home}-vendor-bundle ${diaspora_home}/vendor/bundle
+                mv ${diaspora_home}.bundle ${diaspora_home}/.bundle
                 chown ${diaspora_user}: -R ${diaspora_home}
                 ln -s /usr/bin ${diaspora_home}
             }
+            echo "Making a backup of ${diaspora_home}..."
             backup || true
         fi
         ;;

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