This is an automated email from the ASF dual-hosted git repository.
kturner 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 113f741 Adds support for new managers file (#268)
113f741 is described below
commit 113f741856ed1a8bb2e56245910235a0d3cc9f5a
Author: Keith Turner <[email protected]>
AuthorDate: Wed Jan 20 20:17:01 2021 -0500
Adds support for new managers file (#268)
---
bin/impl/install/accumulo.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/bin/impl/install/accumulo.sh b/bin/impl/install/accumulo.sh
index b3ae1f6..86dfbf1 100755
--- a/bin/impl/install/accumulo.sh
+++ b/bin/impl/install/accumulo.sh
@@ -62,7 +62,12 @@ else
$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"
+
+managers_file="$conf/managers"
+if [[ -f "$conf/masters" ]]; then
+ managers_file="$conf/masters"
+fi
+$SED "s#localhost#$UNO_HOST#" "$managers_file" "$conf/monitor" "$conf/gc"
$SED "s#export ZOOKEEPER_HOME=[^ ]*#export ZOOKEEPER_HOME=$ZOOKEEPER_HOME#"
"$conf"/accumulo-env.sh
$SED "s#export ACCUMULO_LOG_DIR=[^ ]*#export
ACCUMULO_LOG_DIR=$ACCUMULO_LOG_DIR#" "$conf"/accumulo-env.sh
if [[ $ACCUMULO_VERSION =~ ^1\..*$ ]]; then