[DRE-commits] [diaspora-installer] 20/21: remove messages.sh, preinst won't see it

[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 c094ca4bfe5e1215330c0d843aaedb80e7a6ef02
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon May 11 17:56:28 2015 +0530

    remove messages.sh, preinst won't see it
---
 debian/diaspora-common.install |  1 -
 debian/diaspora-common.preinst |  5 ++++-
 messages.sh                    | 12 ------------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/diaspora-common.install b/debian/diaspora-common.install
index f61d885..45cf63f 100644
--- a/debian/diaspora-common.install
+++ b/debian/diaspora-common.install
@@ -3,7 +3,6 @@ grantpriv.sh usr/lib/diaspora-common/scripts
 set-env-nginx.sh usr/lib/diaspora-common/scripts
 set-env-diaspora.sh usr/lib/diaspora-common/scripts
 rake-tasks.sh usr/lib/diaspora-common/scripts
-messages.sh usr/lib/diaspora-common/scripts
 diaspora-common.conf /etc/diaspora
 diaspora.conf /etc
 database.yml usr/share/diaspora/config
diff --git a/debian/diaspora-common.preinst b/debian/diaspora-common.preinst
index 596cc7e..7a8c022 100755
--- a/debian/diaspora-common.preinst
+++ b/debian/diaspora-common.preinst
@@ -29,7 +29,10 @@ case "$1" in
         if ! test -z $dbexist
         then
             # new install should not see existing database
-            ${diaspora_scripts}/messages.sh staledb 
+            echo "There is a PostgreSQl database 'diaspora_production', aborting installation..."
+            echo "You may drop the database and try reinstalling"
+            echo "Command to drop the database: su postgres -c 'dropdb diaspora_production'"
+            echo "WARNING: This will remove all the data in diaspora_production database."
             exit 1
         fi
         ;;
diff --git a/messages.sh b/messages.sh
deleted file mode 100755
index b746f97..0000000
--- a/messages.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-    staledb)
-        echo "There is a PostgreSQl database 'diaspora_production', aborting installation..."
-        echo "You may drop the database and try reinstalling"
-        echo "Command to drop the database: su postgres -c 'dropdb diaspora_production'"
-        echo "WARNING: This will remove all the data in diaspora_production database."
-        ;;
-    *)
-        ;;
-esac

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