[DRE-commits] [diaspora-installer] 01/01: use system binaries for bundle, rake etc

[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 8b98d90e55fb1c32b3afc003a2d184323d7fbb4e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri May 1 22:45:10 2015 +0530

    use system binaries for bundle, rake etc
---
 debian/changelog               | 1 +
 debian/diaspora-common.install | 1 +
 debian/postinst                | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 05687b0..3df345f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ diaspora-installer (0.5.0.0+debian1) UNRELEASED; urgency=medium
   * Install README as doc
   * Needs bundler >= 1.7 to parse per gem source option in Gemfile
   * Switch to 0.5.0.0 release
+  * Symlink /usr/bin to /usr/share/diaspora
 
  -- Pirate Praveen <praveen at debian.org>  Wed, 15 Apr 2015 14:44:12 +0530
 
diff --git a/debian/diaspora-common.install b/debian/diaspora-common.install
index 28e7abc..d9aaff6 100644
--- a/debian/diaspora-common.install
+++ b/debian/diaspora-common.install
@@ -2,3 +2,4 @@ adduser.sh usr/lib/diaspora-common/scripts
 grantpriv.sh usr/lib/diaspora-common/scripts
 set-env-nginx.sh usr/lib/diaspora-common/scripts
 diaspora-common.conf /etc/diaspora
+usr/bin usr/share/diaspora/bin
diff --git a/debian/postinst b/debian/postinst
index 30e1f44..b61345f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -59,8 +59,10 @@ case "$1" in
 	echo "Copying files to ${diaspora_home}..."
 	if test ${diaspora_release_type} = "branch"
 	then
+		rm -rf ${diaspora_cache}/diaspora-release-${diaspora_version}/bin
 		sudo -u ${diaspora_user} cp -r ${diaspora_cache}/diaspora-release-${diaspora_version}/* ${diaspora_home}
 	else
+		rm -rf ${diaspora_cache}/diaspora-${diaspora_version}/bin
 		sudo -u ${diaspora_user} cp -r ${diaspora_cache}/diaspora-${diaspora_version}/* ${diaspora_home}
 	fi
 	echo "Copying source tarball to ${diaspora_home}/public..."

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