From bc3c66588ed0598371f371600c49a27403ba3f9b Mon Sep 17 00:00:00 2001
From: Roland Stirnimann <roland.stirnimann@accenture.com>
Date: Tue, 6 Sep 2022 16:34:50 +0200
Subject: [PATCH] Bundle for version 2.1 created

---
 bin/VERSION                                   |   2 +-
 bundle/install_pgbasenv.sh                    |  15 ++++++++++++++-
 bundle/{pgbasenv-2.0.tar => pgbasenv-2.1.tar} | Bin 117760 -> 122880 bytes
 3 files changed, 15 insertions(+), 2 deletions(-)
 rename bundle/{pgbasenv-2.0.tar => pgbasenv-2.1.tar} (88%)

diff --git a/bin/VERSION b/bin/VERSION
index cd5ac03..879b416 100644
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-2.0
+2.1
diff --git a/bundle/install_pgbasenv.sh b/bundle/install_pgbasenv.sh
index 33082a0..496d04b 100755
--- a/bundle/install_pgbasenv.sh
+++ b/bundle/install_pgbasenv.sh
@@ -68,6 +68,19 @@ if [[ $? -gt 0 ]]; then
   fi
 fi
 
+# Check if md5sum is installed, required by scriptmgr.sh
+command -v md5sum > /dev/null
+if [[ $? -gt 0 ]]; then
+  if [[ -z $SILENT ]]; then
+     read -p "Cannot find md5sum command. It is required to correctly execute scriptmgr.sh used in .psqlrc. Ignore Y or N [N]: " IGNORE_MD5SUM
+     IGNORE_MD5SUM=${IGNORE_MD5SUM:-N}
+     [[ "$IGNORE_MD5SUM" == "N" ]] && exit 0
+  else
+     echo "ERROR: Cannot find md5sum command. It is required to correctly execute scriptmgr.sh used in .psqlrc."
+     exit 1
+  fi
+fi
+
 TARFILE=$(ls -1 pgbasenv-*.tar 2>/dev/null | sort -n -t"-" -k2 | tail -1)
 if [[ -z $TARFILE ]]; then
 	echo "ERROR: Tar file pgbasenv-(VERSION).tar do not found in current directory!"
@@ -204,7 +217,7 @@ fi
 echo "-- PGBASENV BEGIN ---------------------------------" >> ~/.psqlrc
 echo "\set pgbasenv_base \`echo \"$PGBASENV_BASE\"\`" >> ~/.psqlrc
 echo "\! $PGBASENV_BASE/bin/scriptmgr.sh prep" >> ~/.psqlrc
-echo "select substring(''||:VERSION_NAME, 1, position('.' in ''||:VERSION_NAME)-1) as pgreleasenum" >> ~/.psqlrc
+echo "select substring(''||:'VERSION_NAME', 1, position('.' in ''||:'VERSION_NAME')-1) as pgreleasenum" >> ~/.psqlrc
 echo "\gset" >> ~/.psqlrc
 echo "\i :pgbasenv_base/scripts/.run.:pgreleasenum" >> ~/.psqlrc
 echo "-- PGBASENV END -----------------------------------" >> ~/.psqlrc
diff --git a/bundle/pgbasenv-2.0.tar b/bundle/pgbasenv-2.1.tar
similarity index 88%
rename from bundle/pgbasenv-2.0.tar
rename to bundle/pgbasenv-2.1.tar
index 7c2e9c4d9e4563a6166fc58d01e16b9a469135fa..5ab5bee05ba7a7af4aa37e25faa28a2587450e13 100644
GIT binary patch
delta 4210
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

delta 2941
zcmbVOO=}ZT6zxsYkBOF2TS2SHqmA2g-}gd-NZg1Ep$N8?s-Y%nA=c1V5fQD53thDd
z<aJr4)FL7hApxP{s?b737rN-yKjO<rOA^W?zFEvL!<#vC&pG$JyY#(#X|;PfrL>f!
z0}-{VUXh8)y?s<U2o;obE$xXDq+D>`L1ZqDcl#bJEXL>UyZ2_NXX1(UO8@Cj`y`oM
z=|9s~d%65&dl0*RGaE=LC8}RP0*xukl|@4(Ig{muNQIE9gP;pqA>@tby!BiETcBX*
zT3~(~d@DpwH9z2!Yt*(v$)t9y5JpN{yKpUFj_tvv($ziK4g|s@=FblNEnm$JM8CxG
z73A0KZ?z$F1M!RsN15{v+k>ljl|=1IdY1WeuCyikfb*J%g=Vgt7lfBF-Un#QR`rD1
z{y|qlKew<I(~31V4nv00(N@I*q`LeX6|HBR@TjJox#E2V@3`?kT26h^0g;PlP(_{7
zq4){Bfbkx+CuE&f8AV22h0M1QlH1^G^eSVj97j$GSX>3K$9T&vh^5*lenZGJX+zKz
zGz*cCi9CjwubS2{Wi{)G6;wJ~_6ejyzIcoY-HfN)i+s_lMHu1{^*Oi58}Pb}_pXJK
zOi*fztcx9+0>X6zEv{EUnSYBgI~Fv7S{<3Qk^;8+O5b8|av(Rf`_>GO!+`lU4#TI?
z_ow4&G8T(QE`|vqvq>^JNg`u0vl4?rbAAFQI}_=JMA*EZfGef_33wUI-)gZFNg>PD
zuOo~qshw5219P3=l`;t+!Lzj=q$C<8!<qR+W|&M(T_B4yiMg=x(y(BzCt#?$ya&vW
zB-}8;Ik;`sQosVqS@Rs>cXq>f=Vn^s;XqN_+!S{X#lmI^{RRbLscMP}ssy@5MPa}9
zvgyshP2bM7)8ip#c?_-2Os<(2WTRNJ%szu$2A}57`5VM$eWi^X3}SQ2F&j4soOn-u
GLg*i(ti(tF