Take out of functions to make set -e work

pull/7218/head
Jelte Fennema-Nio 2023-09-25 14:04:28 +02:00
parent 7128db7e7c
commit 985bb082b6
1 changed files with 21 additions and 29 deletions

View File

@ -3,44 +3,36 @@
set -euxo pipefail set -euxo pipefail
pg_version=$1 pg_version=$1
citus_old_version=$2 citus_version=$2
base="$(pwd)" base="$(pwd)"
install_citus_and_tar() { # If tarball already exsists we're good
# do everything in a subdirectory to avoid clutter in current directory if [ -f "${base}/install-pg${pg_version}-citus${citus_version}.tar" ]; then
mkdir -p "${builddir}" && cd "${builddir}" exit 0
fi
"${citus_dir}/configure" --without-libcurl basedir="${base}/${citus_version}"
installdir="${builddir}/install" rm -rf "${basedir}"
make "-j$(nproc)" && mkdir -p "${installdir}" && make DESTDIR="${installdir}" install 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"
cd "${installdir}" && find . -type f -print >"${builddir}/files.lst" # do everything in a subdirectory to avoid clutter in current directory
mkdir -p "${builddir}" && cd "${builddir}"
tar cvf "${basedir}/install-pg${pg_version}-citus${citus_version}.tar" $(cat "${builddir}"/files.lst) "${citus_dir}/configure" --without-libcurl
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 installdir="${builddir}/install"
} make "-j$(nproc)" && mkdir -p "${installdir}" && make DESTDIR="${installdir}" install
build_ext() { cd "${installdir}" && find . -type f -print >"${builddir}/files.lst"
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}" tar cvf "${basedir}/install-pg${pg_version}-citus${citus_version}.tar" $(cat "${builddir}"/files.lst)
mv "${basedir}/install-pg${pg_version}-citus${citus_version}.tar" "${base}/install-pg${pg_version}-citus${citus_version}.tar"
rm -rf "${basedir}" cd "${builddir}" && rm -rf install files.lst && make clean
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}"