[DRE-commits] [diaspora-installer] 21/55: remove -pristine

[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 baad0a484949c888c4029641037fb79d53dedb09
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Dec 2 18:52:38 2014 +0530

    remove -pristine
---
 debian/postinst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index 3683bf9..170b3da 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -51,19 +51,20 @@ case "$1" in
 	echo "Already downloaded..."
 	echo "Extracting files..."
 	tar -C /var/cache/diaspora-installer -zxvf /var/cache/diaspora-installer/diaspora-${diaspora_version}.tar.gz
-	exit 1
+	echo "Copying files to /usr/share/diaspora..."
+	sudo -u diaspora cp -r /var/cache/diaspora-installer/diaspora-${diaspora_version}/* /usr/share/diaspora
 	echo "Installing gems with rubygems ..."
 	
-	if ! grep RAILS_ENV /etc/diaspora-pristine.conf
-		then echo export RAILS_ENV=production >> /etc/diaspora-pristine.conf
+	if ! grep RAILS_ENV /etc/diaspora.conf
+		then echo export RAILS_ENV=production >> /etc/diaspora.conf
 	fi
 
 	if ! grep DB /etc/diaspora-diaspora-pristine.conf 
-		then echo export DB=postgres >> /etc/diaspora-pristine.conf
+		then echo export DB=postgres >> /etc/diaspora.conf
 	fi
 	
 	# source diaspora variables	
-	. /etc/diaspora-pristine.conf
+	. /etc/diaspora.conf
 	echo "Verifying we have all required libraries..."
 	sudo -u diaspora -E bundle install --path vendor/bundle
 	echo "Initializing database..."

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