[DRE-commits] [diaspora-installer] 16/21: check staledb only in 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 f1c47c8c795e39eeda7006c37796f579c13df3e1
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon May 11 17:00:52 2015 +0530

    check staledb only in preinst
---
 debian/diaspora-common.postinst | 17 +++++++----------
 debian/diaspora-common.preinst  | 37 ++++++++++++++++++++-----------------
 debian/postinst                 | 27 ++++++++++++---------------
 3 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/debian/diaspora-common.postinst b/debian/diaspora-common.postinst
index 38b64b0..bffe742 100755
--- a/debian/diaspora-common.postinst
+++ b/debian/diaspora-common.postinst
@@ -31,18 +31,15 @@ case "$1" in
         # Source varibales
 	. /etc/diaspora/diaspora-common.conf
         # Check if there is another version installed
-        if su diaspora -s /bin/sh -c "psql  diaspora_production -c ''"
+        if ! test -z $2
         then
-            if ! test -z $2
+            # Show current version of package
+    	    installed_diaspora_version=`echo $2|cut -d+ -f1`
+            installed_diaspora_minor_version=`echo ${installed_diaspora_version} |cut -d. -f3,4`
+            diaspora_minor_version=`echo ${diaspora_version} |cut -d. -f3,4`
+            if test $(echo "${installed_diaspora_minor_version} < ${diaspora_minor_version}" |bc) -eq 1
             then
-                # Show current version of package
-    	        installed_diaspora_version=`echo $2|cut -d+ -f1`
-                installed_diaspora_minor_version=`echo ${installed_diaspora_version} |cut -d. -f3,4`
-                diaspora_minor_version=`echo ${diaspora_version} |cut -d. -f3,4`
-                if test $(echo "${installed_diaspora_minor_version} < ${diaspora_minor_version}" |bc) -eq 1
-                then
-	            echo "Trying update from ${installed_diaspora_version}..."
-                fi
+	        echo "Trying update from ${installed_diaspora_version}..."
             fi
 
         else
diff --git a/debian/diaspora-common.preinst b/debian/diaspora-common.preinst
index 4d98dac..10609e7 100755
--- a/debian/diaspora-common.preinst
+++ b/debian/diaspora-common.preinst
@@ -1,30 +1,33 @@
 #! /bin/sh
 set -e
+# Check if PostgreSQL database diaspora_production exist
+if su diaspora -s /bin/sh -c "psql  diaspora_production -c ''"
+then
+    echo "You already have a PostgreSQL database named 'diaspora_production'."
+    export dbexist='true'
+fi
 
 case "$1" in
     upgrade)
-        # Check if PostgreSQL database diaspora_production exist
-        if su diaspora -s /bin/sh -c "psql  diaspora_production -c ''"
+        if ! test -z $dbexist
         then
-            # Check if its an upgrade
-            if ! test -z $2
+            # Show current version of package
+            installed_diaspora_version=`echo $2|cut -d+ -f1`
+            installed_diaspora_major_version=`echo ${installed_diaspora_version} |cut -d. -f1,2`
+            if test $(echo "${installed_diaspora_major_version} < 0.5" |bc) -eq 1
             then
-                echo "You already have a PostgreSQL database named 'diaspora_production'."
-                # Show current version of package
-                installed_diaspora_version=`echo $2|cut -d+ -f1`
-                installed_diaspora_major_version=`echo ${installed_diaspora_version} |cut -d. -f1,2`
-                if test $(echo "${installed_diaspora_major_version} < 0.5" |bc) -eq 1
-                then
-                    echo "Updating from 0.4.x is not supported yet."
-	            exit 1
-                fi
-            else
-                # new install should not see existing database
-                ${diaspora_scripts}/messages.sh staledb 
-                exit 1
+                echo "Updating from 0.4.x is not supported yet."
+	        exit 1
             fi
         fi
         ;;
+    install)
+        if ! test -z $dbexist
+            # new install should not see existing database
+            ${diaspora_scripts}/messages.sh staledb 
+            exit 1
+        fi
+
     abort-upgrade|install)
         ;;
     *)
diff --git a/debian/postinst b/debian/postinst
index df6c38f..9cab023 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -31,24 +31,21 @@ case "$1" in
         # Source varibales
 	. /etc/diaspora/diaspora-common.conf
 	cd ${diaspora_home}
-        if su diaspora -s /bin/sh -c "psql  diaspora_production -c ''"
+        if ! test -z $2
         then
-            if ! test -z $2
+            installed_diaspora_version=`echo $2|cut -d+ -f1`
+            installed_diaspora_minor_version=`echo ${installed_diaspora_version} |cut -d. -f3,4`
+            diaspora_minor_version=`echo ${diaspora_version} |cut -d. -f3,4`
+            if test $(echo "${installed_diaspora_minor_version} < ${diaspora_minor_version}" |bc) -eq 1
             then
-                installed_diaspora_version=`echo $2|cut -d+ -f1`
-                installed_diaspora_minor_version=`echo ${installed_diaspora_version} |cut -d. -f3,4`
-                diaspora_minor_version=`echo ${diaspora_version} |cut -d. -f3,4`
-                if test $(echo "${installed_diaspora_minor_version} < ${diaspora_minor_version}" |bc) -eq 1
-                then
-                    echo "Running migrations..."
-                    echo "Some migrations may take upto 2 hours in large pods..."
+                echo "Running migrations..."
+                echo "Some migrations may take upto 2 hours in large pods..."
 
-                    # source diaspora variables	
-                    . ${diaspora_conf}
-                    su diaspora -s /bin/sh -c 'bundle exec rake db:migrate'
-                else
-                    echo "This version is already installed..."
-                fi
+                # source diaspora variables	
+                . ${diaspora_conf}
+                su diaspora -s /bin/sh -c 'bundle exec rake db:migrate'
+            else
+                echo "This version is already installed..."
             fi
         else
     	    echo "Download diaspora tarball from github.com..."

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