update 3.4.2

oehrlis · Mar 31, 2023 · a46b125 · a46b125
1 parent bdaed65
commit a46b125
Show file tree

Hide file tree

Showing 134 changed files with 618 additions and 396 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,16 @@ Latest releases are always available via [releases].
 
 ### Fixed
 
+## [3.4.2] - 2023.03.31
+
+### Changed
+
+- update build to generate a tvdldap.tgz file
+
+### Fixed
+
+- Issue with *errexit* either disable it or catch return values
+
 ## [3.4.1] - 2023.03.30
 
 ### Fixed

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v3.4.1
+v3.4.2
diff --git a/build/build.sh b/build/build.sh
@@ -67,15 +67,36 @@ echo "Create sha hash values for all files"
 find . -type f \( ! -iname ".DS_Store" ! -iname ".oudbase.sha" ! -iname "*.log" ! -iname "oudbase_install.sh" ! -iname "oudbase_install.tgz" \) \
   -print0 | xargs -0 shasum >${SCRIPT_DIR}/../local/oudbase/doc/.oudbase.sha
 
+grep -Ev './templates/etc/oud|./templates/create|./bin/oud|./bin/setup|./etc/oud|./templates/logrotate.d|./templates/cron.d|./templates/etc/o|./templates/etc/i|./templates/etc/w|./templates/etc/h' cp ${SCRIPT_DIR}/../local/oudbase/doc/.oudbase.sha
+ >${SCRIPT_DIR}/../local/oudbase/doc/.tvdldap.sha
+
 # Tar all together
 echo "Put all together in a tar"
 tar --verbose -zcvf ${SCRIPT_DIR}/oudbase_install.tgz \
     --exclude=bin/oudbase_install.sh \
     --exclude=log/*.log \
+    --exclude=doc/.tvdldap.sha \
     --exclude='.DS_Store' \
     --exclude='._*'  \
     bin/ doc/ etc/ templates/
 
+# create tns utility tar file
+echo "Put all tns utilities together in a tar"
+tar --verbose -zcvf ${SCRIPT_DIR}/tvdldap_install.tgz \
+    --exclude=bin/*oud* \
+    --exclude=etc/*oud* \
+    --exclude=log/*.log \
+    --exclude=doc/.oudbase.sha \
+    --exclude='.DS_Store' \
+    --exclude=templates/create \
+    --exclude=templates/cron.d \
+    --exclude=templates/logrotate.d \
+    --exclude=templates/etc/*oud* \
+    --exclude=templates/etc/housekeeping.conf \
+    --exclude=templates/etc/install.rsp \
+    --exclude=templates/etc/oraInst.loc \
+    --exclude='._*'  \
+    bin/ doc/ etc/ templates/
 # build this nice executable shell script with a TAR payload
 echo "Create this fancy shell with a tar payload"
 

diff --git a/local/oudbase/bin/oud_backup.sh b/local/oudbase/bin/oud_backup.sh
@@ -5,8 +5,8 @@
 # Name.......: oud_backup.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Bash Script to backup all running OUD Instances
 # Notes......: This script is mainly used for environment without TVD-Basenv
 # Reference..: https://github.com/oehrlis/oudbase
@@ -21,7 +21,7 @@
 # - End of Customization -------------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION=v3.4.1
+VERSION=v3.4.2
 DOAPPEND="TRUE"                                 # enable log file append
 VERBOSE="FALSE"                                 # enable verbose mode
 SCRIPT_NAME=$(basename $0)

diff --git a/local/oudbase/bin/oud_eusm.sh b/local/oudbase/bin/oud_eusm.sh
@@ -5,8 +5,8 @@
 # Name.......: oud_eusm.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Shell script for EUS admin tool (command line)
 # Notes......: This script is mainly used for environment without TVD-Basenv
 # Reference..: https://github.com/oehrlis/oudbase
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION=v3.4.1
+VERSION=v3.4.2
 JRE_HOME=$JAVA_HOME/jre/
 EUSMLIBDIR=$ORACLE_BASE/local/oudbase/lib
 ORACLEPKI=$ORACLE_HOME/oracle_common/modules/oracle.pki/oraclepki.jar

diff --git a/local/oudbase/bin/oud_export.sh b/local/oudbase/bin/oud_export.sh
@@ -5,8 +5,8 @@
 # Name.......: oud_export.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Bash Script to export all running OUD Instances
 # Notes......: This script is mainly used for environment without TVD-Basenv
 # Reference..: https://github.com/oehrlis/oudbase
@@ -21,7 +21,7 @@
 # - End of Customization -------------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION=v3.4.1
+VERSION=v3.4.2
 DOAPPEND="TRUE"                                 # enable log file append
 VERBOSE="FALSE"                                 # enable verbose mode
 SCRIPT_NAME=$(basename $0)

diff --git a/local/oudbase/bin/oud_functions.sh b/local/oudbase/bin/oud_functions.sh
@@ -5,8 +5,8 @@
 # Name.......: oud_functions.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Common OUD Base functions.
 # Notes......: Has to be source in the vagrant provisioning bash scripts to load
 #              environment and default values based on vagrant.yml 
@@ -23,7 +23,7 @@
 
 # - Environment Variables ------------------------------------------------------
 # define default values 
-VERSION=v3.4.1
+VERSION=v3.4.2
 DOAPPEND=${DOAPPEND:-"TRUE"}                    # enable log file append
 VERBOSE=${VERBOSE:-"FALSE"}                     # enable verbose mode
 DEBUG=${DEBUG:-"FALSE"}                         # enable debug mode

diff --git a/local/oudbase/bin/oud_start_stop.sh b/local/oudbase/bin/oud_start_stop.sh
@@ -5,8 +5,8 @@
 # Name.......: oud_start_stop.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Bash Script to start/stop OUD Instances 
 # Notes......: This script is mainly used for environment without TVD-Basenv
 # Reference..: https://github.com/oehrlis/oudbase
@@ -21,7 +21,7 @@
 # - End of Customization -------------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION=v3.4.1
+VERSION=v3.4.2
 DOAPPEND="TRUE"                                 # enable log file append
 VERBOSE="FALSE"                                 # enable verbose mode
 FORCE="FALSE"                                   # enable force restart

diff --git a/local/oudbase/bin/oud_start_stop_all b/local/oudbase/bin/oud_start_stop_all
@@ -5,8 +5,8 @@
 # Name.......: oud_start_stop_all
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Wrapper Script for oud_start_stop.sh to start/stop OUD Instances 
 # Notes......: This script is mainly used for environment without TVD-Basenv
 # Reference..: https://github.com/oehrlis/oudbase
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION=v3.4.1
+VERSION=v3.4.2
 SCRIPT_NAME=$(basename $0)
 export OUDBASE_BIN="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P)"
 # - End of Default Values ------------------------------------------------------

diff --git a/local/oudbase/bin/oud_status.sh b/local/oudbase/bin/oud_status.sh
@@ -5,8 +5,8 @@
 # Name.......: oud_status.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Bash Script to get the instance status as retun code
 # Notes......: This script is mainly used for environment without TVD-Basenv
 # Reference..: https://github.com/oehrlis/oudbase
@@ -23,7 +23,7 @@ export OUD_CON_HANDLER=${OUD_CON_HANDLER:-"LDAP LDAPS"}
 # - End of Customization -------------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION=v3.4.1
+VERSION=v3.4.2
 DOAPPEND="TRUE"                                 # enable log file append
 VERBOSE="FALSE"                                 # enable verbose mode
 SCRIPT_NAME=$(basename $0)

diff --git a/local/oudbase/bin/oudbase_install.sh b/local/oudbase/bin/oudbase_install.sh
@@ -5,8 +5,8 @@
 # Name.......: oudbase_install.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: This script is used as base install script for the OUD 
 #              Environment
 # Notes......: --
@@ -23,7 +23,7 @@ export LOG_BASE=${LOG_BASE-"/tmp"}
 # - End of Customization -------------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION=v3.4.1
+VERSION=v3.4.2
 DOAPPEND="TRUE"                                 # enable log file append
 VERBOSE="TRUE"                                  # enable verbose mode
 SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})"     # Basename of the script

diff --git a/local/oudbase/bin/oudenv.sh b/local/oudbase/bin/oudenv.sh
@@ -5,8 +5,8 @@
 # Name.......: oudenv.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Bash Source File to set the environment for OUD Instances
 # Notes......: This script is mainly used for environment without TVD-Basenv
 # Reference..: https://github.com/oehrlis/oudbase
@@ -22,7 +22,7 @@
 # externally. In principle, these variables should not be changed at this 
 # point. The customization should be done externally in .bash_profile or 
 # in oudenv_core.conf.
-VERSION=v3.4.1
+VERSION=v3.4.2
 
 # define some binaries for later user
 PGREP_BIN=$(command -v pgrep)                                   # get the binary for pgrep

diff --git a/local/oudbase/bin/setup_oud.sh b/local/oudbase/bin/setup_oud.sh
@@ -5,8 +5,8 @@
 # Name.......: setup_oud.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: generic script to install Oracle Unified Directory binaries.
 # Notes......: Script would like to be executed as oracle :-).
 # Reference..: --
@@ -32,7 +32,7 @@ DEFAULT_OUD_ONEOFF_PKGS=""
 # - End of Customization -------------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION=v3.4.1
+VERSION=v3.4.2
 SCRIPT_NAME=$(basename $0)
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P)"
 START_HEADER="START: Start of ${SCRIPT_NAME} (Version ${VERSION}) with $*"

diff --git a/local/oudbase/bin/setup_oud_patch.sh b/local/oudbase/bin/setup_oud_patch.sh
@@ -5,8 +5,8 @@
 # Name.......: setup_oud_patch.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Script to patch Oracle Unified Directory binaries
 # Notes......: - Script would like to be executed as oracle :-)
 #              - If the required software is not in /opt/stage, an attempt is
@@ -36,7 +36,7 @@ DEFAULT_OUD_ONEOFF_PKGS=""
 # - End of Customization -------------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION=v3.4.1
+VERSION=v3.4.2
 SCRIPT_NAME=$(basename $0)
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P)"
 START_HEADER="START: Start of ${SCRIPT_NAME} (Version ${VERSION}) with $*"

diff --git a/local/oudbase/bin/test_scripts.sh b/local/oudbase/bin/test_scripts.sh
@@ -5,8 +5,8 @@
 # Name.......: test_scripts.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Script to test / verify all TNS utilities
 # Notes......: --
 # Reference..: --
@@ -27,7 +27,7 @@ set -o nounset                      # exit if script try to use an uninitialised
 set -o noglob                       # Disable filename expansion (globbing).
 # - Environment Variables ------------------------------------------------------
 # define generic environment variables
-VERSION=v3.4.1
+VERSION=v3.4.2
 ORACLE_BASE=${ORACLE_BASE:-"/u01/app/oracle"}
 TVDLDAP_BIN_DIR=$(dirname $(find ${ORACLE_BASE} -name tns_add.sh 2>/dev/null|head -1))
 # - EOF Environment Variables --------------------------------------------------

diff --git a/local/oudbase/bin/test_unit.sh b/local/oudbase/bin/test_unit.sh
@@ -5,8 +5,8 @@
 # Name.......: test_unit.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Script to test / verify all TNS utilities
 # Notes......: --
 # Reference..: --
@@ -27,7 +27,7 @@ set -o nounset                      # exit if script try to use an uninitialised
 set -o noglob                       # Disable filename expansion (globbing).
 # - Environment Variables ------------------------------------------------------
 # define generic environment variables
-VERSION=v3.4.1
+VERSION=v3.4.2
 TVDLDAP_VERBOSE=${TVDLDAP_VERBOSE:-"FALSE"}                     # enable verbose mode
 TVDLDAP_DEBUG=${TVDLDAP_DEBUG:-"FALSE"}                         # enable debug mode
 TVDLDAP_QUIET=${TVDLDAP_QUIET:-"FALSE"}                         # enable quiet mode

diff --git a/local/oudbase/bin/tns_add.sh b/local/oudbase/bin/tns_add.sh
@@ -5,8 +5,8 @@
 # Name.......: tns_add.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Add a tns entry
 # Notes......: --
 # Reference..: --
@@ -27,7 +27,7 @@ set -o pipefail                     # pipefail exit after 1st piped commands fai
 set -o noglob                       # Disable filename expansion (globbing).
 # - Environment Variables ------------------------------------------------------
 # define generic environment variables
-VERSION=v3.4.1
+VERSION=v3.4.2
 TVDLDAP_VERBOSE=${TVDLDAP_VERBOSE:-"FALSE"}                     # enable verbose mode
 TVDLDAP_DEBUG=${TVDLDAP_DEBUG:-"FALSE"}                         # enable debug mode
 TVDLDAP_QUIET=${TVDLDAP_QUIET:-"FALSE"}                         # enable quiet mode

diff --git a/local/oudbase/bin/tns_delete.sh b/local/oudbase/bin/tns_delete.sh
@@ -5,8 +5,8 @@
 # Name.......: tns_delete.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Delete a tns entry
 # Notes......: --
 # Reference..: --
@@ -27,7 +27,7 @@ set -o pipefail                     # pipefail exit after 1st piped commands fai
 set -o noglob                       # Disable filename expansion (globbing).
 # - Environment Variables ------------------------------------------------------
 # define generic environment variables
-VERSION=v3.4.1
+VERSION=v3.4.2
 TVDLDAP_VERBOSE=${TVDLDAP_VERBOSE:-"FALSE"}                     # enable verbose mode
 TVDLDAP_DEBUG=${TVDLDAP_DEBUG:-"FALSE"}                         # enable debug mode
 TVDLDAP_QUIET=${TVDLDAP_QUIET:-"FALSE"}                         # enable quiet mode

diff --git a/local/oudbase/bin/tns_dump.sh b/local/oudbase/bin/tns_dump.sh
@@ -5,8 +5,8 @@
 # Name.......: tns_dump.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Dump entries as tnsnames.ora
 # Notes......: --
 # Reference..: --
@@ -28,7 +28,7 @@ set -o noglob                       # Disable filename expansion (globbing).
 
 # - Environment Variables ------------------------------------------------------
 # define generic environment variables
-VERSION=v3.4.1
+VERSION=v3.4.2
 TVDLDAP_VERBOSE=${TVDLDAP_VERBOSE:-"FALSE"}                     # enable verbose mode
 TVDLDAP_DEBUG=${TVDLDAP_DEBUG:-"FALSE"}                         # enable debug mode
 TVDLDAP_QUIET=${TVDLDAP_QUIET:-"FALSE"}                         # enable quiet mode

diff --git a/local/oudbase/bin/tns_functions.sh b/local/oudbase/bin/tns_functions.sh
@@ -5,8 +5,8 @@
 # Name.......: tns_functions.sh
 # Author.....: Stefan Oehrli (oes) stefan.oehrli@oradba.ch
 # Editor.....: Stefan Oehrli
-# Date.......: 2023.03.30
-# Version....: v3.4.1
+# Date.......: 2023.03.31
+# Version....: v3.4.2
 # Purpose....: Common functions used by the TNS bash scripts.
 # Notes......: --
 # Reference..: --
@@ -45,7 +45,7 @@ TVDLDAP_DEFAULT_DUMP_OUTPUT_DIR=${TNS_ADMIN:-""}
 
 # - Environment Variables ------------------------------------------------------
 # define generic environment variables
-VERSION=v3.4.1
+VERSION=v3.4.2
 TVDLDAP_VERBOSE=${TVDLDAP_VERBOSE:-"FALSE"}                     # enable verbose mode
 TVDLDAP_DEBUG=${TVDLDAP_DEBUG:-"FALSE"}                         # enable debug mode
 TVDLDAP_QUIET=${TVDLDAP_QUIET:-"FALSE"}                         # enable quiet mode