accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject accumulo git commit: ACCUMULO-4675 "accumulo-util gen-monitor-cert" doesn't work
Date Wed, 05 Jul 2017 13:56:31 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 3708d7094 -> 5abce363a


ACCUMULO-4675 "accumulo-util gen-monitor-cert" doesn't work


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5abce363
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5abce363
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5abce363

Branch: refs/heads/master
Commit: 5abce363a85524103bb51d56d4f036b8d1f06e3a
Parents: 3708d70
Author: Toshihiro Suzuki <brfrn169@gmail.com>
Authored: Tue Jul 4 12:14:47 2017 +0900
Committer: Toshihiro Suzuki <brfrn169@gmail.com>
Committed: Tue Jul 4 12:14:47 2017 +0900

----------------------------------------------------------------------
 assemble/bin/accumulo-util | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5abce363/assemble/bin/accumulo-util
----------------------------------------------------------------------
diff --git a/assemble/bin/accumulo-util b/assemble/bin/accumulo-util
index 9dc7a9d..71aea89 100755
--- a/assemble/bin/accumulo-util
+++ b/assemble/bin/accumulo-util
@@ -74,7 +74,7 @@ function build_native() {
 }
 
 function gen_monitor_cert() {
-  if [[ -z "$JAVA_HOME" || -d "$JAVA_HOME" ]]; then
+  if [[ -z "$JAVA_HOME" || ! -d "$JAVA_HOME" ]]; then
     echo "JAVA_HOME=${JAVA_HOME} must be set and exist"
     exit 1
   fi
@@ -83,7 +83,7 @@ function gen_monitor_cert() {
   KEYPASS=$(LC_CTYPE=C tr -dc '#-~' < /dev/urandom | tr -d '<>&' | head -c 20)
   STOREPASS=$(LC_CTYPE=C tr -dc '#-~' < /dev/urandom | tr -d '<>&' | head -c
20)
   KEYSTOREPATH="${conf}/keystore.jks"
-  TRUSTSTOREPATH="${conf}/conf/cacerts.jks"
+  TRUSTSTOREPATH="${conf}/cacerts.jks"
   CERTPATH="${conf}/server.cer"
 
   if [[ -e "$KEYSTOREPATH" ]]; then


Mime
View raw message