flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [4/4] flink git commit: [hotfix] Allow setting FLINK_CONF_DIR by hand
Date Wed, 26 Aug 2015 10:40:46 GMT
[hotfix] Allow setting FLINK_CONF_DIR by hand


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

Branch: refs/heads/release-0.9
Commit: 594f4f7ce8ca22168bf3879e913923817edd2278
Parents: 7e44712
Author: Aljoscha Krettek <aljoscha.krettek@gmail.com>
Authored: Tue Aug 25 19:26:29 2015 +0200
Committer: Ufuk Celebi <uce@apache.org>
Committed: Wed Aug 26 12:39:39 2015 +0200

----------------------------------------------------------------------
 flink-dist/src/main/flink-bin/bin/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/594f4f7c/flink-dist/src/main/flink-bin/bin/config.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh
index 341144c..2c63cb8 100755
--- a/flink-dist/src/main/flink-bin/bin/config.sh
+++ b/flink-dist/src/main/flink-bin/bin/config.sh
@@ -125,7 +125,7 @@ FLINK_LIB_DIR=$FLINK_ROOT_DIR/lib
 # The above lib path is used by the shell script to retrieve jars in a 
 # directory, so it needs to be unmangled.
 FLINK_ROOT_DIR_MANGLED=`manglePath "$FLINK_ROOT_DIR"`
-FLINK_CONF_DIR=$FLINK_ROOT_DIR_MANGLED/conf
+if [ -z "$FLINK_CONF_DIR" ]; then FLINK_CONF_DIR=$FLINK_ROOT_DIR_MANGLED/conf; fi
 FLINK_BIN_DIR=$FLINK_ROOT_DIR_MANGLED/bin
 FLINK_LOG_DIR=$FLINK_ROOT_DIR_MANGLED/log
 YAML_CONF=${FLINK_CONF_DIR}/flink-conf.yaml


Mime
View raw message