[fluo-uno] branch master updated: Fix #240 Add ZK lib dir to Accumulo class path (#242)

[ct...@apache.org]

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

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo-uno.git


The following commit(s) were added to refs/heads/master by this push:
     new cf330f8  Fix #240 Add ZK lib dir to Accumulo class path (#242)
cf330f8 is described below

commit cf330f86a629dd284d66374205e861182111645e
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Tue Mar 17 23:17:20 2020 -0400

    Fix #240 Add ZK lib dir to Accumulo class path (#242)
    
    Add ZooKeeper 3.5.7's lib directory to Accumulo 2.0.0's class path in
    conf/accumulo-env.sh
---
 bin/impl/install/accumulo.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/impl/install/accumulo.sh b/bin/impl/install/accumulo.sh
index 1140027..265b15a 100755
--- a/bin/impl/install/accumulo.sh
+++ b/bin/impl/install/accumulo.sh
@@ -59,6 +59,9 @@ else
   $SED "s#instance[.]zookeepers=localhost:2181#instance.zookeepers=$UNO_HOST:2181#" "$conf"/accumulo-client.properties
   $SED "s#auth[.]principal=#auth.principal=$ACCUMULO_USER#" "$conf"/accumulo-client.properties
   $SED "s#auth[.]token=#auth.token=$ACCUMULO_PASSWORD#" "$conf"/accumulo-client.properties
+  if [[ $ACCUMULO_VERSION =~ ^2\.0\.0.*$ ]]; then
+    $SED 's#:[$][{]ZOOKEEPER_HOME[}]/[*]:#:${ZOOKEEPER_HOME}/*:${ZOOKEEPER_HOME}/lib/*:#' "$conf"/accumulo-env.sh
+  fi
 fi
 $SED "s#localhost#$UNO_HOST#" "$conf/masters" "$conf/monitor" "$conf/gc"
 $SED "s#export ZOOKEEPER_HOME=[^ ]*#export ZOOKEEPER_HOME=$ZOOKEEPER_HOME#" "$conf"/accumulo-env.sh