From f163721d2d080e9fdb793df0bbb887163804ac1e Mon Sep 17 00:00:00 2001
From: Denis Poisson <denis.poisson@ts.fujitsu.com>
Date: Wed, 18 Oct 2017 14:07:41 +0200
Subject: [PATCH 1/2] Fix some linter warnings, part 7c

---
 kafka-init/wait-for.sh | 2 +-
 kafka/start.sh         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kafka-init/wait-for.sh b/kafka-init/wait-for.sh
index 26c541496..e3148572c 100644
--- a/kafka-init/wait-for.sh
+++ b/kafka-init/wait-for.sh
@@ -119,7 +119,7 @@ do
         ;;
         --)
         shift
-        CLI="$@"
+        CLI="$*"
         break
         ;;
         --help)
diff --git a/kafka/start.sh b/kafka/start.sh
index ed3b7704c..530c84cd6 100755
--- a/kafka/start.sh
+++ b/kafka/start.sh
@@ -1,4 +1,5 @@
 #!/bin/ash
+# shellcheck shell=dash
 
 set -x
 
@@ -23,15 +24,14 @@ export AUTHORIZER_LOG_LEVEL=${AUTHORIZER_LOG_LEVEL:-"WARN"}
 GC_LOG_ENABLED=${GC_LOG_ENABLED:-"False"}
 
 first_zk=$(echo "$ZOOKEEPER_CONNECTION_STRING" | cut -d, -f1)
-zk_host=$(echo "$first_zk" | cut -d\: -f1)
-zk_port=$(echo "$first_zk" | cut -d\: -f2)
+zk_host=$(echo "$first_zk" | cut -d ":" -f1)
+zk_port=$(echo "$first_zk" | cut -d ":" -f2)
 
 # wait for zookeeper to become available
 if [ "$ZOOKEEPER_WAIT" = "true" ]; then
   success="false"
   for i in $(seq "$ZOOKEEPER_WAIT_RETRIES"); do
-    ok=$(echo ruok | nc "$zk_host" "$zk_port" -w "$ZOOKEEPER_WAIT_TIMEOUT")
-    if [ $? -eq 0 -a "$ok" = "imok" ]; then
+    if ok=$(echo ruok | nc "$zk_host" "$zk_port" -w "$ZOOKEEPER_WAIT_TIMEOUT") && [ "$ok" = "imok" ]; then
       success="true"
       break
     else

From d22d3e38082a9040080daa22abcb36f136ac74a8 Mon Sep 17 00:00:00 2001
From: Denis Poisson <denis.poisson@ts.fujitsu.com>
Date: Fri, 20 Oct 2017 09:03:12 +0200
Subject: [PATCH 2/2] update the kafka version

---
 kafka/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka/build.yml b/kafka/build.yml
index cd6508c8f..df79e7c12 100644
--- a/kafka/build.yml
+++ b/kafka/build.yml
@@ -1,6 +1,6 @@
 repository: monasca/kafka
 variants:
-  - tag: 0.9.0.1-2.11-1.1.0
+  - tag: 0.9.0.1-2.11-1.1.1
     args:
       KAFKA_VERSION: "0.9.0.1"
       SCALA_VERSION: "2.11"