[DRE-commits] [diaspora-installer] 01/07: always remove bin symlink

[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 ecb3872e034687600f7f635359fdcef5977fbcb0
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Aug 28 13:19:16 2015 +0530

    always remove bin symlink
---
 debian/changelog |  6 ++++++
 debian/preinst   | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 540bc2e..9301ae5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+diaspora-installer (0.5.2.0+debian4) UNRELEASED; urgency=medium
+
+  * Always remove bin symlink 
+
+ -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 13:18:50 +0530
+
 diaspora-installer (0.5.2.0+debian3) unstable; urgency=medium
 
   * Relax redis-server minimum version to 2:2.8
diff --git a/debian/preinst b/debian/preinst
index 45e489e..0c255bb 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -5,6 +5,12 @@ set -e
 . /etc/diaspora/diaspora-common.conf
 . ${diaspora_conf}
 
+# Fix bin symlink set by earlier versions
+if test -L ${diaspora_home}/bin
+then
+    rm -rf ${diaspora_home}/bin
+fi
+
 # Check if PostgreSQL database diaspora_production exist
 if su diaspora -s /bin/sh -c "psql  diaspora_production -c ''"
 then
@@ -26,11 +32,6 @@ backup() {
     mv ${diaspora_home}.bundle ${diaspora_home}/.bundle
     chown ${diaspora_user}: -R ${diaspora_home}
 	
-    # Fix bin symlink set by earlier versions
-    if test -L ${diaspora_home}/bin
-    then
-        rm -rf ${diaspora_home}/bin
-    fi
 }
  
 case "$1" in

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