diff --git a/deploy.sh b/deploy.sh
index 76ab8fb35..9ce90e442 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,54 +1,53 @@
 #!/bin/bash
 
 if [ "${TRAVIS_BRANCH}" == 'master' ]; then
-	export RBD_IMAGE_VERSION='v0.3.0';
-	export CEPHFS_IMAGE_VERSION='v0.3.0';
+	export RBD_IMAGE_VERSION='v0.3.0'
+	export CEPHFS_IMAGE_VERSION='v0.3.0'
 elif [ "${TRAVIS_BRANCH}" == 'csi-v1.0' ]; then
-	export RBD_IMAGE_VERSION='v1.0.0';
-	export CEPHFS_IMAGE_VERSION='v1.0.0';
+	export RBD_IMAGE_VERSION='v1.0.0'
+	export CEPHFS_IMAGE_VERSION='v1.0.0'
 else
-	echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting";
-	exit 0; # Exiting 0 so that this isn't marked as failing
-fi;
+	echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
+	exit 0 # Exiting 0 so that this isn't marked as failing
+fi
 
 if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
 	docker login -u "${QUAY_IO_USERNAME}" -p "${QUAY_IO_PASSWORD}" quay.io
 	make push-image-rbdplugin push-image-cephfsplugin
 
 	set -xe
-	
+
 	mkdir -p tmp
-	pushd tmp > /dev/null
-	
-	curl https://raw.githubusercontent.com/helm/helm/master/scripts/get > get_helm.sh
+	pushd tmp >/dev/null
+
+	curl https://raw.githubusercontent.com/helm/helm/master/scripts/get >get_helm.sh
 	chmod 700 get_helm.sh
 	./get_helm.sh
-	
+
 	git clone https://github.com/ceph/csi-charts
-	
+
 	mkdir -p csi-charts/docs
-        popd > /dev/null
+	popd >/dev/null
 
 	CHANGED=0
-	VERSION=$(cat deploy/rbd/helm/Chart.yaml | awk '{if(/^version:/){print $2}}')
-	
+	VERSION=$(grep 'version:' deploy/rbd/helm/Chart.yaml | awk '{print $2}')
+
 	if [ ! -f "tmp/csi-charts/docs/rbd/ceph-csi-rbd-$VERSION.tgz" ]; then
-	    CHANGED=1
-	    ln -s helm deploy/rbd/ceph-csi-rbd
-	    mkdir -p tmp/csi-charts/docs/rbd
-	    pushd tmp/csi-charts/docs/rbd > /dev/null
-	    helm init --client-only
-	    helm package ../../../../deploy/rbd/ceph-csi-rbd
-	    popd > /dev/null
+		CHANGED=1
+		ln -s helm deploy/rbd/ceph-csi-rbd
+		mkdir -p tmp/csi-charts/docs/rbd
+		pushd tmp/csi-charts/docs/rbd >/dev/null
+		helm init --client-only
+		helm package ../../../../deploy/rbd/ceph-csi-rbd
+		popd >/dev/null
 	fi
-	
+
 	if [ $CHANGED -eq 1 ]; then
-	    pushd tmp/csi-charts/docs > /dev/null
-	    helm repo index .
-	    git add --all :/ && git commit -m "Update repo"
-	    git push https://"$GITHUB_TOKEN"@github.com/ceph/csi-charts
-	    popd > /dev/null
+		pushd tmp/csi-charts/docs >/dev/null
+		helm repo index .
+		git add --all :/ && git commit -m "Update repo"
+		git push https://"$GITHUB_TOKEN"@github.com/ceph/csi-charts
+		popd >/dev/null
 	fi
 
-fi;
-
+fi
diff --git a/examples/cephfs/exec-bash.sh b/examples/cephfs/exec-bash.sh
index 9ed465768..9c7be54f6 100755
--- a/examples/cephfs/exec-bash.sh
+++ b/examples/cephfs/exec-bash.sh
@@ -4,7 +4,7 @@ CONTAINER_NAME=csi-cephfsplugin
 POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1)
 
 function get_pod_status() {
-	echo -n $(kubectl get $POD_NAME -o jsonpath="{.status.phase}")
+	echo -n "$(kubectl get "$POD_NAME" -o jsonpath="{.status.phase}")"
 }
 
 while [[ "$(get_pod_status)" != "Running" ]]; do
@@ -12,4 +12,4 @@ while [[ "$(get_pod_status)" != "Running" ]]; do
 	echo "Waiting for $POD_NAME (status $(get_pod_status))"
 done
 
-kubectl exec -it ${POD_NAME#*/} -c $CONTAINER_NAME bash
+kubectl exec -it "${POD_NAME#*/}" -c "$CONTAINER_NAME" bash
diff --git a/examples/cephfs/logs.sh b/examples/cephfs/logs.sh
index 25c507430..f88602902 100755
--- a/examples/cephfs/logs.sh
+++ b/examples/cephfs/logs.sh
@@ -4,7 +4,7 @@ CONTAINER_NAME=csi-cephfsplugin
 POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1)
 
 function get_pod_status() {
-	echo -n $(kubectl get $POD_NAME -o jsonpath="{.status.phase}")
+	echo -n "$(kubectl get "$POD_NAME" -o jsonpath="{.status.phase}")"
 }
 
 while [[ "$(get_pod_status)" != "Running" ]]; do
@@ -12,4 +12,4 @@ while [[ "$(get_pod_status)" != "Running" ]]; do
 	echo "Waiting for $POD_NAME (status $(get_pod_status))"
 done
 
-kubectl logs -f $POD_NAME -c $CONTAINER_NAME
\ No newline at end of file
+kubectl logs -f "$POD_NAME" -c "$CONTAINER_NAME"
diff --git a/examples/cephfs/plugin-deploy.sh b/examples/cephfs/plugin-deploy.sh
index 328e95e58..3a2c028de 100755
--- a/examples/cephfs/plugin-deploy.sh
+++ b/examples/cephfs/plugin-deploy.sh
@@ -10,6 +10,6 @@ cd "$deployment_base" || exit 1
 
 objects=(csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac csi-cephfsplugin-attacher csi-cephfsplugin-provisioner csi-cephfsplugin)
 
-for obj in ${objects[@]}; do
+for obj in "${objects[@]}"; do
 	kubectl create -f "./$obj.yaml"
 done
diff --git a/examples/cephfs/plugin-teardown.sh b/examples/cephfs/plugin-teardown.sh
index 763805b8e..fc710d7e7 100755
--- a/examples/cephfs/plugin-teardown.sh
+++ b/examples/cephfs/plugin-teardown.sh
@@ -10,6 +10,6 @@ cd "$deployment_base" || exit 1
 
 objects=(csi-cephfsplugin-attacher csi-cephfsplugin-provisioner csi-cephfsplugin csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac)
 
-for obj in ${objects[@]}; do
+for obj in "${objects[@]}"; do
 	kubectl delete -f "./$obj.yaml"
 done
diff --git a/examples/rbd/exec-bash.sh b/examples/rbd/exec-bash.sh
index a4b32fd7e..44f266cd9 100755
--- a/examples/rbd/exec-bash.sh
+++ b/examples/rbd/exec-bash.sh
@@ -4,7 +4,7 @@ CONTAINER_NAME=csi-rbdplugin
 POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1)
 
 function get_pod_status() {
-	echo -n $(kubectl get $POD_NAME -o jsonpath="{.status.phase}")
+	echo -n "$(kubectl get "$POD_NAME" -o jsonpath="{.status.phase}")"
 }
 
 while [[ "$(get_pod_status)" != "Running" ]]; do
@@ -12,4 +12,4 @@ while [[ "$(get_pod_status)" != "Running" ]]; do
 	echo "Waiting for $POD_NAME (status $(get_pod_status))"
 done
 
-kubectl exec -it ${POD_NAME#*/} -c $CONTAINER_NAME bash
\ No newline at end of file
+kubectl exec -it "${POD_NAME#*/}" -c "$CONTAINER_NAME" bash
diff --git a/examples/rbd/logs.sh b/examples/rbd/logs.sh
index e103d70bf..64aa1a946 100755
--- a/examples/rbd/logs.sh
+++ b/examples/rbd/logs.sh
@@ -4,7 +4,7 @@ CONTAINER_NAME=csi-rbdplugin
 POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1)
 
 function get_pod_status() {
-	echo -n $(kubectl get $POD_NAME -o jsonpath="{.status.phase}")
+	echo -n "$(kubectl get "$POD_NAME" -o jsonpath="{.status.phase}")"
 }
 
 while [[ "$(get_pod_status)" != "Running" ]]; do
@@ -12,4 +12,4 @@ while [[ "$(get_pod_status)" != "Running" ]]; do
 	echo "Waiting for $POD_NAME (status $(get_pod_status))"
 done
 
-kubectl logs -f $POD_NAME -c $CONTAINER_NAME
\ No newline at end of file
+kubectl logs -f "$POD_NAME" -c "$CONTAINER_NAME"
diff --git a/examples/rbd/plugin-deploy.sh b/examples/rbd/plugin-deploy.sh
index b5bc40b18..f638c47da 100755
--- a/examples/rbd/plugin-deploy.sh
+++ b/examples/rbd/plugin-deploy.sh
@@ -10,6 +10,6 @@ cd "$deployment_base" || exit 1
 
 objects=(csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac csi-rbdplugin-attacher csi-rbdplugin-provisioner csi-rbdplugin)
 
-for obj in ${objects[@]}; do
+for obj in "${objects[@]}"; do
 	kubectl create -f "./$obj.yaml"
 done
diff --git a/examples/rbd/plugin-teardown.sh b/examples/rbd/plugin-teardown.sh
index cf8d32a73..5fa3b6649 100755
--- a/examples/rbd/plugin-teardown.sh
+++ b/examples/rbd/plugin-teardown.sh
@@ -10,6 +10,6 @@ cd "$deployment_base" || exit 1
 
 objects=(csi-rbdplugin-attacher csi-rbdplugin-provisioner csi-rbdplugin csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac)
 
-for obj in ${objects[@]}; do
+for obj in "${objects[@]}"; do
 	kubectl delete -f "./$obj.yaml"
 done