You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by br...@apache.org on 2016/12/06 03:42:18 UTC
nifi git commit: NIFI-3132 - Using cygpath and quoting paths
correctly in sh scripts when run in cygwin
Repository: nifi
Updated Branches:
refs/heads/master 78de10dec -> d1f2492de
NIFI-3132 - Using cygpath and quoting paths correctly in sh scripts when run in cygwin
This closes #1292
Signed-off-by: Bryan Rosander <br...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d1f2492d
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d1f2492d
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d1f2492d
Branch: refs/heads/master
Commit: d1f2492dec386228432dc3374d26944c8bef501e
Parents: 78de10d
Author: Bryan Rosander <br...@apache.org>
Authored: Fri Dec 2 14:43:22 2016 -0500
Committer: Bryan Rosander <br...@apache.org>
Committed: Mon Dec 5 22:16:24 2016 -0500
----------------------------------------------------------------------
.../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh | 2 ++
.../src/main/resources/bin/encrypt-config.sh | 4 ++--
nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh | 2 +-
.../nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh | 4 ++--
.../nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh | 4 ++--
5 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/d1f2492d/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 fcfb572..c6336f6 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
@@ -248,6 +248,8 @@ run() {
fi;
NIFI_HOME=$(cygpath --path --windows "${NIFI_HOME}")
+ NIFI_LOG_DIR=$(cygpath --path --windows "${NIFI_LOG_DIR}")
+ NIFI_PID_DIR=$(cygpath --path --windows "${NIFI_PID_DIR}")
BOOTSTRAP_CONF=$(cygpath --path --windows "${BOOTSTRAP_CONF}")
BOOTSTRAP_CONF_DIR=$(cygpath --path --windows "${BOOTSTRAP_CONF_DIR}")
BOOTSTRAP_LIBS=$(cygpath --path --windows "${BOOTSTRAP_LIBS}")
http://git-wip-us.apache.org/repos/asf/nifi/blob/d1f2492d/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
index b6b5f45..f85a20c 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/encrypt-config.sh
@@ -102,7 +102,7 @@ run() {
sudo_cmd_prefix=""
if $cygwin; then
NIFI_TOOLKIT_HOME=$(cygpath --path --windows "${NIFI_TOOLKIT_HOME}")
- CLASSPATH="$NIFI_TOOLKIT_HOME/classpath";$(cygpath --path --windows "${LIBS}")
+ CLASSPATH="$NIFI_TOOLKIT_HOME/classpath;$(cygpath --path --windows "${LIBS}")"
else
CLASSPATH="$NIFI_TOOLKIT_HOME/classpath:${LIBS}"
fi
@@ -117,4 +117,4 @@ run() {
init
-run "$@"
\ No newline at end of file
+run "$@"
http://git-wip-us.apache.org/repos/asf/nifi/blob/d1f2492d/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
index e113ca0..f84e04b 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/s2s.sh
@@ -102,7 +102,7 @@ run() {
sudo_cmd_prefix=""
if $cygwin; then
NIFI_TOOLKIT_HOME=$(cygpath --path --windows "${NIFI_TOOLKIT_HOME}")
- CLASSPATH="$NIFI_TOOLKIT_HOME/classpath";$(cygpath --path --windows "${LIBS}")
+ CLASSPATH="$NIFI_TOOLKIT_HOME/classpath;$(cygpath --path --windows "${LIBS}")"
else
CLASSPATH="$NIFI_TOOLKIT_HOME/classpath:${LIBS}"
fi
http://git-wip-us.apache.org/repos/asf/nifi/blob/d1f2492d/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
index c34c420..619c8ab 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/tls-toolkit.sh
@@ -102,7 +102,7 @@ run() {
sudo_cmd_prefix=""
if $cygwin; then
NIFI_TOOLKIT_HOME=$(cygpath --path --windows "${NIFI_TOOLKIT_HOME}")
- CLASSPATH="$NIFI_TOOLKIT_HOME/classpath";$(cygpath --path --windows "${LIBS}")
+ CLASSPATH="$NIFI_TOOLKIT_HOME/classpath;$(cygpath --path --windows "${LIBS}")"
else
CLASSPATH="$NIFI_TOOLKIT_HOME/classpath:${LIBS}"
fi
@@ -117,4 +117,4 @@ run() {
init "$1"
-run "$@"
\ No newline at end of file
+run "$@"
http://git-wip-us.apache.org/repos/asf/nifi/blob/d1f2492d/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
index e805800..9b935fc 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
+++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/bin/zk-migrator.sh
@@ -102,7 +102,7 @@ run() {
sudo_cmd_prefix=""
if $cygwin; then
NIFI_TOOLKIT_HOME=$(cygpath --path --windows "${NIFI_TOOLKIT_HOME}")
- CLASSPATH="$NIFI_TOOLKIT_HOME/classpath";$(cygpath --path --windows "${LIBS}")
+ CLASSPATH="$NIFI_TOOLKIT_HOME/classpath;$(cygpath --path --windows "${LIBS}")"
else
CLASSPATH="$NIFI_TOOLKIT_HOME/classpath:${LIBS}"
fi
@@ -117,4 +117,4 @@ run() {
init "$1"
-run "$@"
\ No newline at end of file
+run "$@"