From 3f7ec09847b294288ffd8c0964dc4f2a687bf7c8 Mon Sep 17 00:00:00 2001
From: alexz <azvyagintsev@mirantis.com>
Date: Mon, 25 Jul 2016 14:46:12 +0300
Subject: [PATCH] Shell files syntax cleanup

* add SC2001 to shellcheck skip-list
* few functions from CloudFoundryDiego application was changed -
  manual deployment test requeired

Change-Id: Ib7b223553bdfc14f7051911d7ed0e4076c6aebb0
---
 .../package/Resources/scripts/runDockerCommand.sh           | 2 +-
 .../package/Resources/scripts/setupDockerMirror.sh          | 2 +-
 .../package/Resources/scripts/setupDockerRegistry.sh        | 2 +-
 .../package/Resources/scripts/deletePods.sh                 | 2 +-
 .../Resources/scripts/deleteReplicationController.sh        | 2 +-
 .../package/Resources/scripts/deleteService.sh              | 2 +-
 .../package/Resources/scripts/getServiceIp.sh               | 2 +-
 .../package/Resources/scripts/haproxy-setup.sh              | 4 ++--
 .../package/Resources/scripts/master-add-member.sh          | 2 +-
 .../package/Resources/scripts/patchService.sh               | 2 +-
 .../package/Resources/scripts/removeEtcdMember.sh           | 4 ++--
 .../package/Resources/scripts/removeMinion.sh               | 2 +-
 .../package/Resources/scripts/restartContainers.sh          | 4 ++--
 .../KubernetesCluster/package/Resources/scripts/scale-rc.sh | 2 +-
 .../package/Resources/scripts/setupDockerMirror.sh          | 2 +-
 .../package/Resources/scripts/setupDockerRegistry.sh        | 2 +-
 .../package/Resources/scripts/setupFlannelMaster.sh         | 4 ++--
 .../package/Resources/scripts/setupFlannelNode.sh           | 2 +-
 .../package/Resources/scripts/updatePod.sh                  | 6 +++---
 .../package/Resources/scripts/updateService.sh              | 4 ++--
 .../Resources/scripts/destroyReplicationController.sh       | 2 +-
 .../package/Resources/scripts/destroyService.sh             | 2 +-
 22 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/DockerStandaloneHost/package/Resources/scripts/runDockerCommand.sh b/DockerStandaloneHost/package/Resources/scripts/runDockerCommand.sh
index 213c4a3..bb93eda 100644
--- a/DockerStandaloneHost/package/Resources/scripts/runDockerCommand.sh
+++ b/DockerStandaloneHost/package/Resources/scripts/runDockerCommand.sh
@@ -11,4 +11,4 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-docker $*
\ No newline at end of file
+docker "$@"
diff --git a/DockerStandaloneHost/package/Resources/scripts/setupDockerMirror.sh b/DockerStandaloneHost/package/Resources/scripts/setupDockerMirror.sh
index 32cf7b8..0b8ae40 100644
--- a/DockerStandaloneHost/package/Resources/scripts/setupDockerMirror.sh
+++ b/DockerStandaloneHost/package/Resources/scripts/setupDockerMirror.sh
@@ -13,4 +13,4 @@
 
 source /etc/default/docker
 DOCKER_OPTS+=" --registry-mirror=$1"
-echo DOCKER_OPTS=\"$DOCKER_OPTS\" > /etc/default/docker
\ No newline at end of file
+echo "DOCKER_OPTS=${DOCKER_OPTS}" > /etc/default/docker
diff --git a/DockerStandaloneHost/package/Resources/scripts/setupDockerRegistry.sh b/DockerStandaloneHost/package/Resources/scripts/setupDockerRegistry.sh
index 36f1950..dba4337 100644
--- a/DockerStandaloneHost/package/Resources/scripts/setupDockerRegistry.sh
+++ b/DockerStandaloneHost/package/Resources/scripts/setupDockerRegistry.sh
@@ -13,4 +13,4 @@
 
 source /etc/default/docker
 DOCKER_OPTS+=" --insecure-registry $1"
-echo DOCKER_OPTS=\"$DOCKER_OPTS\" > /etc/default/docker
\ No newline at end of file
+echo "DOCKER_OPTS=${DOCKER_OPTS}" > /etc/default/docker
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/deletePods.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/deletePods.sh
index 59a138e..3dcbd08 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/deletePods.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/deletePods.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "Deleting Pods" >> /tmp/murano-kube.log
-/opt/bin/kubectl delete pod -l $1 >> /tmp/murano-kube.log
+/opt/bin/kubectl delete pod -l "$1" >> /tmp/murano-kube.log
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/deleteReplicationController.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/deleteReplicationController.sh
index 5c35bb2..57ec72a 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/deleteReplicationController.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/deleteReplicationController.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "Deleting a replication controller" >> /tmp/murano-kube.log
-/opt/bin/kubectl delete replicationcontrollers $1 >> /tmp/murano-kube.log
+/opt/bin/kubectl delete replicationcontrollers "$1" >> /tmp/murano-kube.log
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/deleteService.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/deleteService.sh
index b832c9e..ef42992 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/deleteService.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/deleteService.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "Deleting a Service" >> /tmp/murano-kube.log
-/opt/bin/kubectl delete service $1 >> /tmp/murano-kube.log
+/opt/bin/kubectl delete service "$1" >> /tmp/murano-kube.log
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/getServiceIp.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/getServiceIp.sh
index afaa355..778263d 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/getServiceIp.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/getServiceIp.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-/opt/bin/kubectl get service $1 --template '{{.spec.clusterIP}}' -o template
+/opt/bin/kubectl get service "$1" --template '{{.spec.clusterIP}}' -o template
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy-setup.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy-setup.sh
index d1f2b4a..d5fd1bf 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy-setup.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/haproxy-setup.sh
@@ -5,7 +5,7 @@
 cp -f haproxy.toml /etc/confd/conf.d/
 cp -f haproxy.tmpl /etc/confd/templates/
 
-/usr/local/bin/confd -onetime -backend etcd -node $1:4001
+/usr/local/bin/confd -onetime -backend etcd -node "$1:4001"
 
 cp -f default_scripts/haproxy /etc/default/
 
@@ -23,4 +23,4 @@ else
   service haproxy start
 fi
 
-sleep 1
\ No newline at end of file
+sleep 1
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/master-add-member.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/master-add-member.sh
index 9f6f597..c9aa966 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/master-add-member.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/master-add-member.sh
@@ -9,7 +9,7 @@ echo "Adding member $1 to etcd cluster" >> /tmp/etcd.log
 while [ $count -gt 0 ]; do
  /opt/bin/etcdctl cluster-health >> /tmp/etcd.log
  if [ $? -eq 0 ]; then
-   out=$((/opt/bin/etcdctl member add "$1" "http://$2:7001") 2>&1)
+   out=$( (/opt/bin/etcdctl member add "$1" "http://$2:7001") 2>&1)
    if [ $? -ne 0 ]; then
      echo "Member $1 not added. Reason: $out" >> /tmp/etcd.log
      break
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/patchService.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/patchService.sh
index 087ed0d..64149b3 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/patchService.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/patchService.sh
@@ -3,4 +3,4 @@
 # $1 - service name
 # $2 - publicIPs JSON
 
-/opt/bin/kubectl update service $1 --patch="$2"
+/opt/bin/kubectl update service "$1" --patch="$2"
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/removeEtcdMember.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/removeEtcdMember.sh
index b453cc5..440ba2a 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/removeEtcdMember.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/removeEtcdMember.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-NODE_ID=$(/opt/bin/etcdctl member list | grep $1 | cut -d':' -f1)
-/opt/bin/etcdctl member remove $NODE_ID
+NODE_ID=$(/opt/bin/etcdctl member list | grep "$1" | cut -d':' -f1)
+/opt/bin/etcdctl member remove "${NODE_ID}"
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/removeMinion.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/removeMinion.sh
index 06ccb85..4659850 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/removeMinion.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/removeMinion.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "Deleting Kubernetes Node" >> /tmp/murano-kube.log
-/opt/bin/kubectl delete node $1 >> /tmp/murano-kube.log
+/opt/bin/kubectl delete node "$1" >> /tmp/murano-kube.log
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/restartContainers.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/restartContainers.sh
index d5ebe2c..36f5a39 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/restartContainers.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/restartContainers.sh
@@ -4,5 +4,5 @@
 
 CONTAINERS=$(docker ps -q --filter "name=_$1-")
 if (( ${#CONTAINERS} > 0 )); then
-  docker restart $CONTAINERS
-fi
\ No newline at end of file
+  docker restart "${CONTAINERS}"
+fi
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/scale-rc.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/scale-rc.sh
index 19c1dd3..d78a46c 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/scale-rc.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/scale-rc.sh
@@ -3,4 +3,4 @@
 # $1 - RC name
 # $2 - new size
 
-/opt/bin/kubectl scale rc $1 --replicas=$2
+/opt/bin/kubectl scale rc "${1}" --replicas="${2}"
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerMirror.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerMirror.sh
index c9f67dc..749d9fc 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerMirror.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerMirror.sh
@@ -2,4 +2,4 @@
 
 source /etc/default/docker
 DOCKER_OPTS+=" --registry-mirror=$1"
-echo DOCKER_OPTS=\"$DOCKER_OPTS\" > /etc/default/docker
\ No newline at end of file
+echo "DOCKER_OPTS=${DOCKER_OPTS}" > /etc/default/docker
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerRegistry.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerRegistry.sh
index 22432ef..4c7def2 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerRegistry.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerRegistry.sh
@@ -2,4 +2,4 @@
 
 source /etc/default/docker
 DOCKER_OPTS+=" --insecure-registry $1"
-echo DOCKER_OPTS=\"$DOCKER_OPTS\" > /etc/default/docker
\ No newline at end of file
+echo "DOCKER_OPTS=${DOCKER_OPTS}" > /etc/default/docker
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelMaster.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelMaster.sh
index fefd6ba..2974bbb 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelMaster.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelMaster.sh
@@ -3,10 +3,10 @@ count=30
 
 echo "Adding flannel configuration to etcd"
 
-command=$((/opt/bin/etcdctl set /coreos.com/network/config '{"Network":"10.200.0.0/16"}') 2>&1)
+command=$( (/opt/bin/etcdctl set /coreos.com/network/config '{"Network":"10.200.0.0/16"}') 2>&1)
 
 while [ $count -gt 0 ]; do
- if [ $command ]; then
+ if [ "${command}" ]; then
    echo "Flannel is configured on master node" >> /tmp/etcd.log
    exit 0
  fi
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelNode.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelNode.sh
index 5113984..e1f58c6 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelNode.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelNode.sh
@@ -28,7 +28,7 @@ done
 ip link set dev docker0 down
 brctl delbr docker0
 
-echo DOCKER_OPTS=\"-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU}\" > /etc/default/docker
+echo "DOCKER_OPTS=-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU}" > /etc/default/docker
 
 echo post-up iptables -t nat -A POSTROUTING -s 10.200.0.0/16 ! -d 10.200.0.0/16 -j MASQUERADE >>  /etc/network/interfaces.d/eth0.cfg
 iptables -t nat -A POSTROUTING -s 10.200.0.0/16 ! -d 10.200.0.0/16 -j MASQUERADE
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/updatePod.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/updatePod.sh
index d3b43a5..037ca0c 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/updatePod.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/updatePod.sh
@@ -3,7 +3,7 @@
 #  File with pod is /tmp/pod.json
 # $1 new or update
 DEFINITION_DIR=/var/run/murano-kubernetes
-mkdir -p $DEFINITION_DIR
+mkdir -p "${DEFINITION_DIR}"
 
 podId=$2
 fileName=$3
@@ -12,8 +12,8 @@ echo "$podId Pod $fileName" >> $DEFINITION_DIR/elements.list
 if [ "$1" == "True" ]; then
   #new Pod
   echo "Creating a new Pod" >> /tmp/murano-kube.log
-  /opt/bin/kubectl create -f $fileName >> /tmp/murano-kube.log
+  /opt/bin/kubectl create -f "${fileName}" >> /tmp/murano-kube.log
 else
   echo "Updating a Pod" >> /tmp/murano-kube.log
-  /opt/bin/kubectl update -f $fileName >> /tmp/murano-kube.log
+  /opt/bin/kubectl update -f "${fileName}" >> /tmp/murano-kube.log
 fi
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/updateService.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/updateService.sh
index 848a51e..4912a50 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/updateService.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/updateService.sh
@@ -11,8 +11,8 @@ echo "$serviceId Service $fileName" >> $DEFINITION_DIR/elements.list
 
 if [ "$1" == "True" ]; then
   echo "Creating a new Service" >> /tmp/murano-kube.log
-  /opt/bin/kubectl create -f $fileName >> /tmp/murano-kube.log
+  /opt/bin/kubectl create -f "${fileName}" >> /tmp/murano-kube.log
 else
   echo "Updating a Service" >> /tmp/murano-kube.log
-  /opt/bin/kubectl update -f $fileName >> /tmp/murano-kube.log
+  /opt/bin/kubectl update -f "${fileName}" >> /tmp/murano-kube.log
 fi
diff --git a/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyReplicationController.sh b/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyReplicationController.sh
index 786a11d..d17efcf 100644
--- a/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyReplicationController.sh
+++ b/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyReplicationController.sh
@@ -12,4 +12,4 @@
 #  under the License.
 
 echo "Deleting a replication controller" >> /tmp/murano-kube.log
-/opt/bin/kubectl delete replicationcontrollers $1 >> /tmp/murano-kube.log
+/opt/bin/kubectl delete replicationcontrollers "$1" >> /tmp/murano-kube.log
diff --git a/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyService.sh b/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyService.sh
index 90433e4..910d812 100644
--- a/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyService.sh
+++ b/Kubernetes/KubernetesEntitiesLibrary/package/Resources/scripts/destroyService.sh
@@ -12,4 +12,4 @@
 #  under the License.
 
 echo "Deleting a Service" >> /tmp/murano-kube.log
-/opt/bin/kubectl delete services $1 >> /tmp/murano-kube.log
+/opt/bin/kubectl delete services "$1" >> /tmp/murano-kube.log