[Gforge-commits] gforge/deb-specific install-db.sh, 1.27.2.2, 1.27.2.3

[lo-lan-do]

Update of /cvsroot/gforge/gforge/deb-specific
In directory db.perdue.net:/tmp/cvs-serv21948/deb-specific

Modified Files:
      Tag: Branch_3_1
        install-db.sh 
Log Message:
Better detection of errors.


Index: install-db.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/install-db.sh,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -u -d -r1.27.2.2 -r1.27.2.3
--- install-db.sh       23 Nov 2003 14:07:20 -0000      1.27.2.2
+++ install-db.sh       10 Jan 2004 21:41:44 -0000      1.27.2.3
@@ -91,7 +91,7 @@
        if dpkg --compare-versions $pg_version lt 7.3 ; then
            if su -s /bin/sh postgres -c "createuser --no-createdb --no-adduser 
$db_user" 1> $tmp1 2> $tmp2 \
                && [ "$(head -1 $tmp1)" = 'CREATE USER' ] \
-               || grep -q "^ERROR:  CREATE USER: user name \"$db_user\" 
already exists$" $tmp2 ; then
+               || grep -q "^ERROR: .* user name \"$db_user\" already exists$" 
$tmp2 ; then
                # Creation OK or user already existing -- no problem here
                rm -f $tmp1 $tmp2
            else
@@ -131,7 +131,7 @@
        tmp2=$(mktemp /tmp/$pattern)
        if su -s /bin/sh postgres -c "createdb --encoding=UNICODE $db_name" 1> 
$tmp1 2> $tmp2 \
            && [ "$(head -1 $tmp1)" = 'CREATE DATABASE' ] \
-           || grep -q "ERROR:  CREATE DATABASE: database \"$db_name\" already 
exists" $tmp2 ; then
+           || grep -q "ERROR: .* database \"$db_name\" already exists" $tmp2 ; 
then
            # Creation OK or database already existing -- no problem here
            echo -n ""
            rm -f $tmp1 $tmp2