From 9e8f7b973a14c4bc3bb37c521c259c5322bbde37 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <psteinhardt@gitlab.com>
Date: Tue, 16 Mar 2021 10:38:35 +0100
Subject: [PATCH] scripts: Fix pgbouncer install script not reporting errors

The install-pgbouncer script is not currently reporting any build errors
to the caller, except if the final `rm -rf` fails. Fix the issue by
executing `set -xeuo pipefail` to properly report errors of any
unchecked commands and chaining commands with `&&`'s. While the latter
shouldn't be necessary anymore because of changed options, it's easy
enough to do for this script.

With this change, we now properly notice that building pgbouncer fails
currently because of a missing libevent dependency. This failure is
fixed in a subsequent commit.
---
 scripts/install-pgbouncer | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/scripts/install-pgbouncer b/scripts/install-pgbouncer
index be00920..9c7c35f 100755
--- a/scripts/install-pgbouncer
+++ b/scripts/install-pgbouncer
@@ -1,19 +1,18 @@
 #!/bin/bash
 
+set -xeuo pipefail
+
 PGBOUNCER_VERSION=${1}
 PGBOUNCER_DOWNLOAD_SHA256=${2}
-
 PGBOUNCER_DOWNLOAD_URL="https://pgbouncer.github.io/downloads/files/$PGBOUNCER_VERSION/pgbouncer-$PGBOUNCER_VERSION.tar.gz"
 
-curl -o pgbouncer.tar.gz -fsSL $PGBOUNCER_DOWNLOAD_URL
-echo "${PGBOUNCER_DOWNLOAD_SHA256} pgbouncer.tar.gz" | sha256sum -c -
-
-tar xfz pgbouncer.tar.gz
-rm -f pgbouncer.tar.gz
-cd pgbouncer-${PGBOUNCER_VERSION}
-./configure --prefix=/usr/local
-make
-cp pgbouncer /usr/local/bin
-
-cd ..
-rm -rf pgbouncer-${PGBOUNCER_VERSION}
+curl -o pgbouncer.tar.gz -fsSL $PGBOUNCER_DOWNLOAD_URL \
+    && echo "${PGBOUNCER_DOWNLOAD_SHA256} pgbouncer.tar.gz" | sha256sum -c - \
+    && tar xfz pgbouncer.tar.gz \
+    && rm -f pgbouncer.tar.gz \
+    && cd pgbouncer-${PGBOUNCER_VERSION} \
+    && ./configure --prefix=/usr/local \
+    && make \
+    && cp pgbouncer /usr/local/bin \
+    && cd .. \
+    && rm -rf pgbouncer-${PGBOUNCER_VERSION}