Merge ~doismellburning/launchpad:bail-on-fail-on-db-setup into launchpad:master

[Kristian Glass]

Exit on failure in launchpad-database-setup

Let's avoid:

    Creating postgresql user runner
    createuser: could not connect to database postgres

    Looks like everything went ok.

[Colin Watson (cjwatson)]

This needs other changes further down the script; anywhere that runs a command and then tests $? is going to need to be adjusted to work with set -e.

review: Needs Fixing

[Kristian Glass (doismellburning)]

Good point, thanks - I don't think I love these variable names, but they should do the job!

[Colin Watson (cjwatson)]

I normally just use "code" or something similarly not-very-nymous for this sort of thing, but this is fine.

If you prefer, you could also consider this style, which may be neater in this case:

  if sudo grep -qs "^auto" /etc/postgresql/$try_pgversion/main/start.conf; then
    pgversion="$try_pgversion"
    break
  fi

and:

  if ! sudo grep -q "port.*5432" /etc/postgresql/$pgversion/main/postgresql.conf; then
    echo "..."
  fi

review: Approve

[Ioana Lasc (ilasc)]

review: Approve

[Kristian Glass (doismellburning)]

Much neater, thanks Colin

diff --git a/utilities/launchpad-database-setup b/utilities/launchpad-database-setup
index 0b893de..46a36ce 100755
--- a/utilities/launchpad-database-setup
+++ b/utilities/launchpad-database-setup
@@ -3,6 +3,8 @@
 # Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+set -e  # Exit immediately if a command exits with a non-zero status.
+
 if [ -n "$1" ]; then
     USER=$1
     echo "Creating Launchpad database for $USER"
@@ -21,8 +23,7 @@ fi
 pgversion=
 for try_pgversion in 10
 do
-  sudo grep -qs "^auto" /etc/postgresql/$try_pgversion/main/start.conf
-  if [ $? -eq 0 ]; then
+  if sudo grep -qs "^auto" /etc/postgresql/$try_pgversion/main/start.conf; then
     pgversion="$try_pgversion"
     break
   fi
@@ -37,8 +38,7 @@ fi
 echo "Using postgres $pgversion"
 
 # Make sure that we have the correct version running on port 5432
-sudo grep -q "port.*5432" /etc/postgresql/$pgversion/main/postgresql.conf
-if [ $? -ne 0 ]; then
+if ! sudo grep -q "port.*5432" /etc/postgresql/$pgversion/main/postgresql.conf; then
   echo "Please check /etc/postgresql/$pgversion/main/postgresql.conf and"
   echo "ensure postgres is running on port 5432."
 fi;