[DRE-commits] [diaspora-installer] 05/06: branch is extracted differently

[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 5b4fcf8aec80e1b79e10433cc50dcc140ef36e6e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Apr 15 15:21:11 2015 +0530

    branch is extracted differently
---
 debian/postinst | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index 361fbde..621f268 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -45,21 +45,31 @@ case "$1" in
 	echo "Download diaspora tarball from github.com..."
 	mkdir -p ${diaspora_cache}
 	if ! test -f ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz
-		then 
-			if test ${diaspora_release_type} = "branch"
-			then
-				wget -O ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz ${github_archive_url}/release/${diaspora_version}.tar.gz
-			else
-				wget -O ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz ${github_archive_url}/v${diaspora_version}.tar.gz
-			fi
+	then 
+		if test ${diaspora_release_type} = "branch"
+		then
+			wget -O ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz ${github_archive_url}/release/${diaspora_version}.tar.gz
+		else
+			wget -O ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz ${github_archive_url}/v${diaspora_version}.tar.gz
+		fi
 	fi
 	echo "Already downloaded..."
 	echo "Extracting files..."
 	tar -C ${diaspora_cache} -zxvf ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz >/dev/null
 	echo "Copying files to ${diaspora_home}..."
-	sudo -u ${diaspora_user} cp -r ${diaspora_cache}/diaspora-${diaspora_version}/* ${diaspora_home}
+	if test ${diaspora_release_type} = "branch"
+	then
+		sudo -u ${diaspora_user} cp -r ${diaspora_cache}/diaspora-release-${diaspora_version}/* ${diaspora_home}
+	else
+		sudo -u ${diaspora_user} cp -r ${diaspora_cache}/diaspora-${diaspora_version}/* ${diaspora_home}
+	fi
 	echo "Copying source tarball to ${diaspora_home}/public..."
-	sudo -u ${diaspora_user} cp ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz ${diaspora_home}/public/source.tar.gz
+	if test ${diaspora_release_type} = "branch"
+	then
+		sudo -u ${diaspora_user} cp ${diaspora_cache}/diaspora-release-${diaspora_version}.tar.gz ${diaspora_home}/public/source.tar.gz
+	else
+		sudo -u ${diaspora_user} cp ${diaspora_cache}/diaspora-${diaspora_version}.tar.gz ${diaspora_home}/public/source.tar.gz
+	fi
 	echo "Installing gems with rubygems ..."
 	echo "Using ${diaspora_conf}..."
 	if ! grep RAILS_ENV ${diaspora_conf}

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