[fluo-uno] branch main updated: Update Accumulo 2.0.x classpath for newer ZKs (#265)

[ct...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 6494624  Update Accumulo 2.0.x classpath for newer ZKs (#265)
6494624 is described below

commit 6494624383e9134e66d59f2a3f3db6b3e1a1a973
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Dec 23 16:30:57 2020 -0500

    Update Accumulo 2.0.x classpath for newer ZKs (#265)
    
    Update class path for all versions of Accumulo 2.0, rather than just
    2.0.0, to support newer ZooKeeper versions (3.5 and later)
---
 bin/impl/install/accumulo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/impl/install/accumulo.sh b/bin/impl/install/accumulo.sh
index 24aa38a..b3ae1f6 100755
--- a/bin/impl/install/accumulo.sh
+++ b/bin/impl/install/accumulo.sh
@@ -56,7 +56,7 @@ 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
+  if [[ $ACCUMULO_VERSION =~ ^2\.0\..*$ ]]; then
     # Ignore false positive; we actually want the literal '${ZOOKEEPER_HOME}' and not its current value
     # shellcheck disable=SC2016
     $SED 's#:[$][{]ZOOKEEPER_HOME[}]/[*]:#:${ZOOKEEPER_HOME}/*:${ZOOKEEPER_HOME}/lib/*:#' "$conf"/accumulo-env.sh