From 9d5afd7b83c35971cb9978408e9f895c146b7655 Mon Sep 17 00:00:00 2001
From: Igor Todorovski <itodorov@ca.ibm.com>
Date: Fri, 24 Nov 2023 14:56:07 -0500
Subject: [PATCH] setup.sh for meta will refresh the zopen-config

---
 buildenv                        | 12 ++++++++----
 tests/zopen_check_basic_install |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/buildenv b/buildenv
index 64e7321..6970da2 100644
--- a/buildenv
+++ b/buildenv
@@ -8,6 +8,7 @@ export ZOPEN_DEV_DEPS="git gzip make tar bash zoslib help2man perl curl grep gro
 export ZOPEN_CONFIGURE="skip"
 export ZOPEN_MAKE="skip"
 export ZOPEN_CHECK="zopen_check"
+export ZOPEN_INSTALL="zopen_install"
 
 META_DEV_DIR="${PWD}/meta"
 if [ -z "${ZOPEN_META_DEV_ROOT}" ] ; then
@@ -17,9 +18,7 @@ if [ -z "${ZOPEN_META_DEV_ROOT}" ] ; then
       exit 8
     fi
   fi
-  export ZOPEN_INSTALL="zopen_install"
 else
-  export ZOPEN_INSTALL='skip'
   echo "Installation will not be performed - testing dev environment"
 
   if ! [ -d "${ZOPEN_META_DEV_ROOT}" ] ; then
@@ -119,8 +118,10 @@ zopen_install()
     return 8
   fi
   mkdir -p "$ZOPEN_INSTALL_DIR"
-  rm -rvf "$PWD/zotsampleport"
-  rm -rvf "$PWD/.git"* "$PWD/.editorconfig"
+  if [ -z "$ZOPEN_META_DEV_ROOT" ]; then
+    rm -rvf "$PWD/zotsampleport"
+    rm -rvf "$PWD/.git"* "$PWD/.editorconfig"
+  fi
   cp -rv $PWD/* $ZOPEN_INSTALL_DIR/
   mkdir -p "$ZOPEN_INSTALL_DIR/man/man1"
   zopen-help2man "$ZOPEN_INSTALL_DIR/man/man1"
@@ -136,6 +137,9 @@ zopen_install()
 }
 
 zopen_append_to_setup() {
+cat <<ZZ
+  \$PWD/bin/zopen init --refresh
+ZZ
 }
 
 zopen_get_version()
diff --git a/tests/zopen_check_basic_install b/tests/zopen_check_basic_install
index b53cfa9..8460501 100755
--- a/tests/zopen_check_basic_install
+++ b/tests/zopen_check_basic_install
@@ -18,7 +18,7 @@ echo "Rc=$?"
 echo "Testing if zopen was installed at: ${zopenenv}/usr/local/zopen"
 [ ! -e "${zopenenv}/usr/local/zopen" ] && echo "File system not available" && exit 8
 echo "Testing source of the zopen-config file"
-[ ! -e "${zopenenv}/etc/zopen-config" ] && echo "xopen configuration not available" && exit 8
+[ ! -e "${zopenenv}/etc/zopen-config" ] && echo "zopen configuration not available" && exit 8
 
 echo "Testing source of configuration file"
 # shellcheck disable=SC1091