nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tk...@apache.org
Subject nifi git commit: NIFI-1481 fixed a couple bugs in bash script for cygwin and when JAVA_HOME not set
Date Tue, 15 Mar 2016 02:42:39 GMT
Repository: nifi
Updated Branches:
  refs/heads/master 76ce3f752 -> f22db218e


NIFI-1481 fixed a couple bugs in bash script for cygwin and when JAVA_HOME not set

Reviewed by Aldrin Piri (aldrin@apache.org). This closes #277


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

Branch: refs/heads/master
Commit: f22db218e3903191acef7eec593bdefbd2685b74
Parents: 76ce3f7
Author: trkurc <tkurc@gizmolabs.org>
Authored: Mon Mar 14 22:13:42 2016 -0400
Committer: trkurc <tkurc@gizmolabs.org>
Committed: Mon Mar 14 22:40:25 2016 -0400

----------------------------------------------------------------------
 .../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/f22db218/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
index da9b722..063065d 100755
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
@@ -121,7 +121,7 @@ locateJava() {
     # if command is env, attempt to add more to the classpath
     if [ "$1" = "env" ]; then
         [ "x${TOOLS_JAR}" =  "x" ] && [ -n "${JAVA_HOME}" ] && TOOLS_JAR=$(find
-H "${JAVA_HOME}" -name "tools.jar")
-        [ "x${TOOLS_JAR}" =  "x" ] && TOOLS_JAR=$(find -H "${JAVA_HOME}" -name "classes.jar")
+        [ "x${TOOLS_JAR}" =  "x" ] && [ -n "${JAVA_HOME}" ] && TOOLS_JAR=$(find
-H "${JAVA_HOME}" -name "classes.jar")
         if [ "x${TOOLS_JAR}" =  "x" ]; then
              warn "Could not locate tools.jar or classes.jar. Please set manually to avail
all command features."
         fi
@@ -183,6 +183,7 @@ run() {
         BOOTSTRAP_LIBS=$(cygpath --path --windows "${BOOTSTRAP_LIBS}")
         BOOTSTRAP_CLASSPATH="${BOOTSTRAP_CONF_DIR};${BOOTSTRAP_LIBS}"
         if [ -n "${TOOLS_JAR}" ]; then
+            TOOLS_JAR=$(cygpath --path --windows "${TOOLS_JAR}")
             BOOTSTRAP_CLASSPATH="${TOOLS_JAR};${BOOTSTRAP_CLASSPATH}"
         fi
     else


Mime
View raw message