From d4f780cebf4788ff359c846dbec28887f74e9f6b Mon Sep 17 00:00:00 2001 From: Dom Garguilo Date: Wed, 12 Aug 2026 12:49:27 -0400 Subject: [PATCH 1/2] Support Accumulo 4 in uno ashell --- bin/impl/commands.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/impl/commands.sh b/bin/impl/commands.sh index b8a7f93..009f982 100755 --- a/bin/impl/commands.sh +++ b/bin/impl/commands.sh @@ -287,7 +287,11 @@ function uno_status_main() { function uno_ashell_main() { check_dirs ACCUMULO_HOME || return 1 - "$ACCUMULO_HOME"/bin/accumulo shell -u "$ACCUMULO_USER" -p "$ACCUMULO_PASSWORD" "$@" + if [[ $ACCUMULO_VERSION =~ ^[23]\..*$ ]]; then + "$ACCUMULO_HOME"/bin/accumulo shell -u "$ACCUMULO_USER" -p "$ACCUMULO_PASSWORD" "$@" + else + "$ACCUMULO_HOME"/bin/accumulo shell "$@" + fi } function uno_jshell_main() { From 6972c36b9bf8fa5106efa10bf5fa4426211ca1f8 Mon Sep 17 00:00:00 2001 From: Dom Garguilo Date: Wed, 12 Aug 2026 16:16:32 -0400 Subject: [PATCH 2/2] simplify to always use accumulo-client.properties --- bin/impl/commands.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bin/impl/commands.sh b/bin/impl/commands.sh index 009f982..05251a9 100755 --- a/bin/impl/commands.sh +++ b/bin/impl/commands.sh @@ -287,11 +287,7 @@ function uno_status_main() { function uno_ashell_main() { check_dirs ACCUMULO_HOME || return 1 - if [[ $ACCUMULO_VERSION =~ ^[23]\..*$ ]]; then - "$ACCUMULO_HOME"/bin/accumulo shell -u "$ACCUMULO_USER" -p "$ACCUMULO_PASSWORD" "$@" - else - "$ACCUMULO_HOME"/bin/accumulo shell "$@" - fi + "$ACCUMULO_HOME"/bin/accumulo shell "$@" } function uno_jshell_main() {