[bigtop] branch master updated: BIGTOP-3439. Oozie's smoke test fails on CentOS and Fedora. (#689)

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 8eec66e  BIGTOP-3439. Oozie's smoke test fails on CentOS and Fedora. (#689)
8eec66e is described below

commit 8eec66e1f9a7bc85dc74864cd7ef54f51d28c21e
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Thu Nov 5 09:25:19 2020 +0900

    BIGTOP-3439. Oozie's smoke test fails on CentOS and Fedora. (#689)
---
 bigtop-packages/src/common/oozie/install_oozie.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bigtop-packages/src/common/oozie/install_oozie.sh b/bigtop-packages/src/common/oozie/install_oozie.sh
index 4460397..8ca0a48 100755
--- a/bigtop-packages/src/common/oozie/install_oozie.sh
+++ b/bigtop-packages/src/common/oozie/install_oozie.sh
@@ -234,6 +234,8 @@ ln -s ${DATA_DIR#${SERVER_PREFIX}} ${SERVER_LIB_DIR}/libext
 
 # Remove jars provided by 'oozie-client' from 'oozie' to avoid run-time issues
 # while installing the package.
-for oozie_client_jar_file in $(ls $CLIENT_LIB_DIR/lib); do
-  rm -f $SERVER_LIB_DIR/lib/$oozie_client_jar_file
-done
\ No newline at end of file
+if [ "${SERVER_PREFIX}" != "${CLIENT_PREFIX}" ]; then
+  for oozie_client_jar_file in $(ls $CLIENT_LIB_DIR/lib); do
+    rm -f $SERVER_LIB_DIR/lib/$oozie_client_jar_file
+  done
+fi