Take out of functions to make set -e work

src/test/regress/citus_tests/upgrade/generate_citus_tarballs.sh

@@ -3,11 +3,24 @@
 set -euxo pipefail
 
 pg_version=$1
-citus_old_version=$2
+citus_version=$2
 
 base="$(pwd)"
 
-install_citus_and_tar() {
+# If tarball already exsists we're good
+if [ -f "${base}/install-pg${pg_version}-citus${citus_version}.tar" ]; then
+    exit 0
+fi
+
+basedir="${base}/${citus_version}"
+
+rm -rf "${basedir}"
+mkdir -p "${basedir}"
+cd "${basedir}"
+citus_dir=${basedir}/citus_$citus_version
+git clone --branch "$citus_version" https://github.com/citusdata/citus.git --depth 1 citus_"$citus_version"
+builddir="${basedir}/build"
+
 # do everything in a subdirectory to avoid clutter in current directory
 mkdir -p "${builddir}" && cd "${builddir}"
 
@@ -22,25 +35,4 @@ install_citus_and_tar() {
 mv "${basedir}/install-pg${pg_version}-citus${citus_version}.tar" "${base}/install-pg${pg_version}-citus${citus_version}.tar"
 
 cd "${builddir}" && rm -rf install files.lst && make clean
-}
 
-build_ext() {
-    citus_version="$1"
-    # If tarball already exsists we're good
-    if [ -f "${base}/install-pg${pg_version}-citus${citus_version}.tar" ]; then
-        return
-    fi
-
-    basedir="${base}/${citus_version}"
-
-    rm -rf "${basedir}"
-    mkdir -p "${basedir}"
-    cd "${basedir}"
-    citus_dir=${basedir}/citus_$citus_version
-    git clone --branch "$citus_version" https://github.com/citusdata/citus.git --depth 1 citus_"$citus_version"
-    builddir="${basedir}/build"
-
-    install_citus_and_tar
-}
-
-build_ext "${citus_old_version}"