[DRE-commits] [diaspora-installer] 04/04: move link handling to preinst

[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 859d41e851d9d77d7ef1e033d8998eafaea3046a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Aug 27 12:50:18 2015 +0530

    move link handling to preinst
---
 debian/postinst | 7 -------
 debian/preinst  | 7 ++++++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index 3a46100..93c14d0 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -30,13 +30,6 @@ case "$1" in
     configure)
         # Source varibales
 	. /etc/diaspora/diaspora-common.conf
-	
-	# Fix bin symlink set by earlier versions
-	if test -L ${diaspora_home}/bin
-	then
-	    rm -rf ${diaspora_home}/bin
-	fi
-
 	cd ${diaspora_home}
         if ! test -z $2
         then
diff --git a/debian/preinst b/debian/preinst
index c92ffd3..f78ffd0 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -25,7 +25,12 @@ backup() {
     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}
+	
+    # 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