[scripts] Fixes correct Flink bin path usage in scripts

flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java

@@ -452,12 +452,12 @@ public final class ConfigConstants {
 	
 	public static final String FLINK_JVM_OPTIONS = "env.java.opts";
 
-  	// --------------------------- Recovery -----------------------------------
+	// --------------------------- Recovery -----------------------------------
 
 	/** Defines recovery mode used for the cluster execution ("standalone", "zookeeper") */
 	public static final String RECOVERY_MODE = "recovery.mode";
 
-  	// --------------------------- ZooKeeper ----------------------------------
+	// --------------------------- ZooKeeper ----------------------------------
 
 	/** ZooKeeper servers. */
 	public static final String ZOOKEEPER_QUORUM_KEY = "ha.zookeeper.quorum";

flink-dist/src/main/flink-bin/bin/jobmanager.sh

@@ -72,4 +72,4 @@ if [[ $STARTSTOP == "start" ]]; then
     fi
 fi
 
-${bin}/flink-daemon.sh $STARTSTOP jobmanager "${args}"
+${FLINK_BIN_DIR}/flink-daemon.sh $STARTSTOP jobmanager "${args}"

flink-dist/src/main/flink-bin/bin/start-cluster.sh

@@ -49,7 +49,7 @@ else
     echo "Starting cluster (${STREAMING_MODE} mode)."
 
     # Start single JobManager on this machine
-    "$bin"/jobmanager.sh start cluster ${STREAMING_MODE}
+    "$FLINK_BIN_DIR"/jobmanager.sh start cluster ${STREAMING_MODE}
 fi
 shopt -u nocasematch
 

flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh

@@ -39,7 +39,7 @@ while read server ; do
         id=${BASH_REMATCH[1]}
         address=${BASH_REMATCH[2]}
 
-        ssh -n $FLINK_SSH_OPTS $address -- "nohup /bin/bash -l $bin/zookeeper.sh start $id &"
+        ssh -n $FLINK_SSH_OPTS $address -- "nohup /bin/bash -l $FLINK_BIN_DIR/zookeeper.sh start $id &"
     else
         echo "[WARN] Parse error. Skipping config entry '$server'."
     fi

flink-dist/src/main/flink-bin/bin/stop-cluster.sh

@@ -26,7 +26,7 @@ bin=`cd "$bin"; pwd`
 readSlaves
 
 for slave in ${SLAVES[@]}; do
-    ssh -n $FLINK_SSH_OPTS $slave -- "nohup /bin/bash -l $bin/taskmanager.sh stop &"
+    ssh -n $FLINK_SSH_OPTS $slave -- "nohup /bin/bash -l $FLINK_BIN_DIR/taskmanager.sh stop &"
 done
 
 # Stop JobManager instance(s)
@@ -36,10 +36,10 @@ if [[ $RECOVERY_MODE == "zookeeper" ]]; then
     readMasters
 
     for master in ${MASTERS[@]}; do
-        ssh -n $FLINK_SSH_OPTS $master -- "nohup /bin/bash -l $bin/jobmanager.sh stop &"
+        ssh -n $FLINK_SSH_OPTS $master -- "nohup /bin/bash -l $FLINK_BIN_DIR/jobmanager.sh stop &"
     done
 
 else
-	  "$bin"/jobmanager.sh stop
+	  "$FLINK_BIN_DIR"/jobmanager.sh stop
 fi
 shopt -u nocasematch

flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh

@@ -39,7 +39,7 @@ while read server ; do
         id=${BASH_REMATCH[1]}
         server=${BASH_REMATCH[2]}
 
-        ssh -n $FLINK_SSH_OPTS $server -- "nohup /bin/bash -l $bin/zookeeper.sh stop &"
+        ssh -n $FLINK_SSH_OPTS $server -- "nohup /bin/bash -l $FLINK_BIN_DIR/zookeeper.sh stop &"
     else
         echo "[WARN] Parse error. Skipping config entry '$server'."
     fi

flink-dist/src/main/flink-bin/bin/taskmanager.sh

@@ -64,4 +64,4 @@ if [[ $STARTSTOP == "start" ]]; then
     args="--configDir ${FLINK_CONF_DIR} --streamingMode ${STREAMINGMODE}"
 fi
 
-${bin}/flink-daemon.sh $STARTSTOP taskmanager "${args}"
+${FLINK_BIN_DIR}/flink-daemon.sh $STARTSTOP taskmanager "${args}"

flink-dist/src/main/flink-bin/bin/zookeeper.sh

@@ -53,4 +53,4 @@ if [[ $STARTSTOP == "start" ]]; then
     args="--zkConfigFile $ZK_CONF --peerId $PEER_ID"
 fi
 
-${bin}/flink-daemon.sh $STARTSTOP zookeeper "${args}"
+${FLINK_BIN_DIR}/flink-daemon.sh $STARTSTOP zookeeper "${args}"