Revert "Take out of functions to make set -e work"

This reverts commit 985bb082b6.
pull/7218/head
Onur Tirtir 2023-09-26 17:04:01 +03:00
parent ba4283575b
commit 5e6646f1b0
1 changed files with 29 additions and 21 deletions

View File

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