From f83c004b7e91ebf453e712e1dea285b74afb8c6a Mon Sep 17 00:00:00 2001
From: Stefan Oehrli <stefan.oehrli@trivadis.com>
Date: Wed, 11 Apr 2018 21:30:41 +0200
Subject: [PATCH] remove dependency on shasum (perl), fall back to sha1sum

---
 build/build.sh                       |  2 +-
 local/oudbase/bin/oud_backup.sh      |  2 +-
 local/oudbase/bin/oud_export.sh      |  2 +-
 local/oudbase/bin/oud_status.sh      |  2 +-
 local/oudbase/bin/oudbase_install.sh |  2 +-
 local/oudbase/bin/oudenv.sh          |  2 +-
 local/oudbase/doc/.oudbase.sha       | 88 ++++++++++++++--------------
 local/oudbase/doc/.version           |  4 +-
 local/oudbase/etc/oudenv.conf        |  2 +-
 9 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/build/build.sh b/build/build.sh
index 3bda1c48..2c24b0e0 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -36,7 +36,7 @@ cp ${SCRIPT_DIR}/../LICENSE ${SCRIPT_DIR}/../local/oudbase/doc
 # create sha hash's
 echo "Create sha hashs for all files"
 find . -type f \( ! -iname ".DS_Store" ! -iname ".oudbase.sha" ! -iname "*.log" ! -iname "oudbase_install.sh" \) \
-  -print0 | xargs -0 shasum -p >${SCRIPT_DIR}/../local/oudbase/doc/.oudbase.sha
+  -print0 | xargs -0 shasum >${SCRIPT_DIR}/../local/oudbase/doc/.oudbase.sha
 
 # Tar all together
 echo "Put all together in a tar"
diff --git a/local/oudbase/bin/oud_backup.sh b/local/oudbase/bin/oud_backup.sh
index a841a597..51545d2e 100755
--- a/local/oudbase/bin/oud_backup.sh
+++ b/local/oudbase/bin/oud_backup.sh
@@ -21,7 +21,7 @@
 # - End of Customization ------------------------------------------------
  
 # - Default Values ------------------------------------------------------
-VERSION="v1.3.7"
+VERSION="v1.3.8"
 DOAPPEND="TRUE"                                 # enable log file append
 VERBOSE="FALSE"                                 # enable verbose mode
 SCRIPT_NAME=$(basename $0)
diff --git a/local/oudbase/bin/oud_export.sh b/local/oudbase/bin/oud_export.sh
index 7b6ff2aa..55e6f28f 100755
--- a/local/oudbase/bin/oud_export.sh
+++ b/local/oudbase/bin/oud_export.sh
@@ -21,7 +21,7 @@
 # - End of Customization ------------------------------------------------
  
 # - Default Values ------------------------------------------------------
-VERSION="v1.3.7"
+VERSION="v1.3.8"
 DOAPPEND="TRUE"                                 # enable log file append
 VERBOSE="FALSE"                                 # enable verbose mode
 SCRIPT_NAME=$(basename $0)
diff --git a/local/oudbase/bin/oud_status.sh b/local/oudbase/bin/oud_status.sh
index 2b219e6b..acb1b07e 100755
--- a/local/oudbase/bin/oud_status.sh
+++ b/local/oudbase/bin/oud_status.sh
@@ -21,7 +21,7 @@ export OUD_ROOT_DN=${OUD_ROOT_DN:-"postgasse.org"}
 # - End of Customization ------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION="v1.3.7"
+VERSION="v1.3.8"
 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
index 1587e878..3c5bd9a3 100755
--- a/local/oudbase/bin/oudbase_install.sh
+++ b/local/oudbase/bin/oudbase_install.sh
@@ -23,7 +23,7 @@ export LOG_BASE=${LOG_BASE-"/tmp"}
 # - End of Customization ------------------------------------------------
 
 # - Default Values ------------------------------------------------------
-VERSION="v1.3.7"
+VERSION="v1.3.8"
 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
index be304a87..683d469d 100755
--- a/local/oudbase/bin/oudenv.sh
+++ b/local/oudbase/bin/oudenv.sh
@@ -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="v1.3.7"
+VERSION="v1.3.8"
 # hostname based on hostname or $HOSTNAME whatever works
 export HOST=$(hostname 2>/dev/null ||echo $HOSTNAME)
 # Absolute path of script directory
diff --git a/local/oudbase/doc/.oudbase.sha b/local/oudbase/doc/.oudbase.sha
index 80483cfd..8a4627ba 100644
--- a/local/oudbase/doc/.oudbase.sha
+++ b/local/oudbase/doc/.oudbase.sha
@@ -1,44 +1,44 @@
-a85a428f71679ac50960048948483826766fa1a3 ?./bin/oud_status.sh
-fb9e4f03c62bca833c2206fb5ed92ffc387ff369 ?./bin/oud_export.sh
-b6de77f5a21da485c8aac8c1f72b35e5dd10e531 ?./bin/oud_backup.sh
-fa3d47658b7e5b45b243fd8e2236a7ddb2a77eae ?./bin/oudenv.sh
-eae0291c2f607231f369bdbedd2dc7bf0c318d54 ?./etc/oudenv_core.conf
-24f0c85305a6de084091211989ba255cd86b6bd0 ?./etc/oudenv.conf
-2ea0c0069dd86f9aaae99c274f38182c981e2113 ?./etc/oudenv_custom.conf
-ef2a6ff1dfb0d3c5604cd5a4565b1358cac54137 ?./etc/oudtab
-5db71a75ccbd45f85f4dbbaba286a222d2b2a760 ?./etc/oud._DEFAULT_.conf
-8c1112a8541a51368a708ed903b9994e31492547 ?./templates/ldif/oud_pi_init.ldif
-b11ba7558dc9f97e5a2545fe672b82fc0a346615 ?./templates/etc/wls_oudsm.service
-52265a8fd3f28504fe0483ac2800d3660265d8d7 ?./templates/etc/oudenv_core.conf
-03fcc0fbc2cd3435e11b8a04767b087ea10dfc73 ?./templates/etc/install.rsp
-ef58125ad4db5264e90fccc0f76d420a6122fa6b ?./templates/etc/oudenv.conf
-5e9de046f186d9930f145b5a5158116959104d2d ?./templates/etc/oraInst.loc
-5c559c7e035e5c31fbbc3a6e3ca208b61c75fb42 ?./templates/etc/oudenv_custom.conf
-ef2a6ff1dfb0d3c5604cd5a4565b1358cac54137 ?./templates/etc/oudtab
-5db71a75ccbd45f85f4dbbaba286a222d2b2a760 ?./templates/etc/oud._DEFAULT_.conf
-b1255404db8a3ceb0280ed77afab182243dc2aae ?./templates/etc/oud_instance.service
-8407fb21690782d03bc9d0f514c7dd2aa23fac60 ?./templates/cron.d/oud
-282053063fc527abfb2e5bfb40587da6fe6fe677 ?./templates/.bash_profile
-b8fda5240323ee307fcff0f813ee9096270ad5aa ?./templates/logrotate.d/oudsm
-a08b4174eba98bb9861bbce2b13b7da5202fece4 ?./templates/logrotate.d/oud
-061b1cf9a14f0b2e52c071bfb821b0435a747a42 ?./templates/logrotate.d/oudbase
-613554bb13e73a94c1718d531b1ef14abeac530b ?./templates/create/01_create_instance.sh
-8c73c3c514cbb07ba90b52f351b20f1187c069e9 ?./templates/create/04_create_root_user.ldif
-9523e5fee4b85a761a2c834506c35ad727b3cc21 ?./templates/create/00_init_environment.sh
-59ab8e7529c147db4697a8951916cba3bb2f90dc ?./templates/create/02_configure_instance.sh
-ee60972b022cbfba9b1bd0a7ec644ab1e1c2c67e ?./templates/create/02_configure_instance.ldif
-1a9f839f6e96cd63ad915a63baab34acc8d1ae59 ?./templates/create/03_import_data_offline.sh
-46e9f815e41864c3ff1d25611c69de6a12cac505 ?./templates/create/21_initialize_host1.sh
-2c056851e4a29a68177bf198c50bab4760c5a4fa ?./templates/create/22_initialize_host2.sh
-da39a3ee5e6b4b0d3255bfef95601890afd80709 ?./templates/create/03_import_data_offline.ldif
-ec8f5617caebf5504874ae98831812674cc3bbc3 ?./templates/create/13_replication_add_host3.sh
-848d272768170ae33e288257d14f46b6fdaff206 ?./templates/create/04_create_root_user.sh
-c67db0413f3d6b2787809a4da00d1dc13be901d0 ?./templates/create/23_initialize_host3.sh
-1337ac35543d467a1e9516d26e0bd99d6b83a967 ?./templates/create/create_oudsm.py
-af6577182dabe2ce6c73dd184f9f1ba543a6a9b5 ?./templates/create/12_replication_add_host2.sh
-abe0a18757b04ca99c155b6018984bb26db496be ?./templates/create/10_enable_replication.sh
-994f75086c57e4b0ecfb1b975cc04d53f37b31a4 ?./templates/create/04_create_root_user.conf
-39ddc950916cb748e9f042978a93a85272602221 ?./templates/create/02_configure_instance.conf
-8624bcdae55baeef00cd11d5dfcfa60f68710a02 ?./doc/LICENSE
-e7c9d528e7902c20fbd5b2545db2d539db7d499f ?./doc/README.md
-8f2af30942f02b12aad13e2717c929036d2f41c8 ?./doc/.version
+df9a7c45b8cfa4fa6cf106422e059a0d3238e84c  ./bin/oud_status.sh
+85b8c7bf943e51f29fd02935c6130d546cddf8f3  ./bin/oud_export.sh
+7e8f5d59366eca4abf4a3e63e44e1d6527aaf955  ./bin/oud_backup.sh
+0d1049c83b2f0caec94d0dc00f6dad229d93d5e2  ./bin/oudenv.sh
+eae0291c2f607231f369bdbedd2dc7bf0c318d54  ./etc/oudenv_core.conf
+d715a8eda7daa3b88d2f49fd7c50c7b9e5a49edf  ./etc/oudenv.conf
+2ea0c0069dd86f9aaae99c274f38182c981e2113  ./etc/oudenv_custom.conf
+ef2a6ff1dfb0d3c5604cd5a4565b1358cac54137  ./etc/oudtab
+5db71a75ccbd45f85f4dbbaba286a222d2b2a760  ./etc/oud._DEFAULT_.conf
+8c1112a8541a51368a708ed903b9994e31492547  ./templates/ldif/oud_pi_init.ldif
+b11ba7558dc9f97e5a2545fe672b82fc0a346615  ./templates/etc/wls_oudsm.service
+52265a8fd3f28504fe0483ac2800d3660265d8d7  ./templates/etc/oudenv_core.conf
+03fcc0fbc2cd3435e11b8a04767b087ea10dfc73  ./templates/etc/install.rsp
+ef58125ad4db5264e90fccc0f76d420a6122fa6b  ./templates/etc/oudenv.conf
+5e9de046f186d9930f145b5a5158116959104d2d  ./templates/etc/oraInst.loc
+5c559c7e035e5c31fbbc3a6e3ca208b61c75fb42  ./templates/etc/oudenv_custom.conf
+ef2a6ff1dfb0d3c5604cd5a4565b1358cac54137  ./templates/etc/oudtab
+5db71a75ccbd45f85f4dbbaba286a222d2b2a760  ./templates/etc/oud._DEFAULT_.conf
+b1255404db8a3ceb0280ed77afab182243dc2aae  ./templates/etc/oud_instance.service
+8407fb21690782d03bc9d0f514c7dd2aa23fac60  ./templates/cron.d/oud
+282053063fc527abfb2e5bfb40587da6fe6fe677  ./templates/.bash_profile
+b8fda5240323ee307fcff0f813ee9096270ad5aa  ./templates/logrotate.d/oudsm
+a08b4174eba98bb9861bbce2b13b7da5202fece4  ./templates/logrotate.d/oud
+061b1cf9a14f0b2e52c071bfb821b0435a747a42  ./templates/logrotate.d/oudbase
+927a5696fa2c3758c0c83d06518508944e03cb1b  ./templates/create/01_create_instance.sh
+79cdccf401d372f1fb3da6384dc4d8e84a4c4a4a  ./templates/create/04_create_root_user.ldif
+7bfdd1e2636ebd61dc76c1aef0fa4b3f5200b797  ./templates/create/00_init_environment.sh
+933c860b44bba4b3b2294bce34ae2e3c9b2a1572  ./templates/create/02_configure_instance.sh
+9c41ca6360ca2afd3c470fafe096a4a1d63259b4  ./templates/create/02_configure_instance.ldif
+5763c9a343d9940a3c1d8e7af0f9b47c49a8a546  ./templates/create/03_import_data_offline.sh
+46e9f815e41864c3ff1d25611c69de6a12cac505  ./templates/create/21_initialize_host1.sh
+2c056851e4a29a68177bf198c50bab4760c5a4fa  ./templates/create/22_initialize_host2.sh
+da39a3ee5e6b4b0d3255bfef95601890afd80709  ./templates/create/03_import_data_offline.ldif
+ec8f5617caebf5504874ae98831812674cc3bbc3  ./templates/create/13_replication_add_host3.sh
+d4de62499176b04abd7cf02c1b8023ebdb9ab080  ./templates/create/04_create_root_user.sh
+c67db0413f3d6b2787809a4da00d1dc13be901d0  ./templates/create/23_initialize_host3.sh
+1337ac35543d467a1e9516d26e0bd99d6b83a967  ./templates/create/create_oudsm.py
+af6577182dabe2ce6c73dd184f9f1ba543a6a9b5  ./templates/create/12_replication_add_host2.sh
+abe0a18757b04ca99c155b6018984bb26db496be  ./templates/create/10_enable_replication.sh
+47a241d65e4bbeb98007e1208c59912c74bb5024  ./templates/create/04_create_root_user.conf
+2d26fd37756fc53552d7df45cc5acbc1c4bedd40  ./templates/create/02_configure_instance.conf
+8624bcdae55baeef00cd11d5dfcfa60f68710a02  ./doc/LICENSE
+e7c9d528e7902c20fbd5b2545db2d539db7d499f  ./doc/README.md
+7a07aa935ebb1897e2c0ac620ee3a5dfa6b43cf4  ./doc/.version
diff --git a/local/oudbase/doc/.version b/local/oudbase/doc/.version
index 5b989b25..58aff728 100644
--- a/local/oudbase/doc/.version
+++ b/local/oudbase/doc/.version
@@ -1,6 +1,6 @@
 
-OUD Base Release v1.3.7 (https://github.com/oehrlis/oudbase)
+OUD Base Release v1.3.8 (https://github.com/oehrlis/oudbase)
 ------------------------------------------------------------
 
-The following files of oudbase are changed/added (compared to v1.3.7):
+The following files of oudbase are changed/added (compared to v1.3.8):
 ----------------------------------------------------------------------
diff --git a/local/oudbase/etc/oudenv.conf b/local/oudbase/etc/oudenv.conf
index db510ec6..272490f6 100644
--- a/local/oudbase/etc/oudenv.conf
+++ b/local/oudbase/etc/oudenv.conf
@@ -91,6 +91,6 @@ alias tas='tail -f -n 50 ${OUD_INSTANCE_HOME}/OUD/logs/server.out'
 alias task='manage-tasks --hostname localhost --port $PORT_ADMIN --trustAll --bindDN "cn=Directory Manager" --bindPasswordFile $PWD_FILE'
 alias tasksum='manage-tasks --hostname localhost --port $PORT_ADMIN --trustAll --bindDN "cn=Directory Manager" --bindPasswordFile $PWD_FILE --summary'
 alias u='oud_up'
-alias version='cd ${OUD_BASE};cat doc/.version; { shasum -c doc/.oudbase.sha 2>/dev/null|grep -v ": OK"|sed "s/: FAILED$//"|sed "s/$/: CHANGED/"; find . -type f \( ! -iname ".oudbase.sha" ! -iname "*.log" \) -print0|xargs -0 shasum -p|grep -Fxvf doc/.oudbase.sha |cut -d? -f2|sed "s/$/: ADDED/"; }|sort -u -t: -k1,1|sed "s/^\./\$OUD_BASE/";cd - >/dev/null'
+alias version='cd ${OUD_BASE};cat doc/.version; { sha1sum -c doc/.oudbase.sha 2>/dev/null |grep -v ": OK"|sed "s/: FAILED$//"|sed "s/$/: CHANGED/"; find . -type f \( ! -iname ".oudbase.sha" ! -iname "*.log" \) -print0|xargs -0 sha1sum |grep -Fxvf doc/.oudbase.sha |cut -d" " -f3|sed "s/$/: ADDED/"; }|sort -u -t: -k1,1|sed "s/^\./\$OUD_BASE/";cd - >/dev/null'
 alias vio='vi "${ETC_BASE}/oudtab"'
 # - EOF -----------------------------------------------------------------