diff --git a/README.md b/README.md
index 6275520..dfee34e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://dev.azure.com/home-assistant/Home%20Assistant/_apis/build/status/home-assistant.hassio-installer?branchName=master)](https://dev.azure.com/home-assistant/Home%20Assistant/_build/latest?definitionId=6&branchName=master)
+
 # Install Hass.io
 
 Beside the usage of the images it's also possible to run Hass.io on a generic system without flashing an image.
diff --git a/files/hassio-supervisor b/files/hassio-supervisor
index 241c248..54d0758 100644
--- a/files/hassio-supervisor
+++ b/files/hassio-supervisor
@@ -17,7 +17,7 @@ fi
 
 # Init supervisor
 HASSIO_DATA=${DATA}
-HASSIO_IMAGE_ID=$(docker inspect --format='{{.Id}}' ${SUPERVISOR})
+HASSIO_IMAGE_ID=$(docker inspect --format='{{.Id}}' "${SUPERVISOR}")
 HASSIO_CONTAINER_ID=$(docker inspect --format='{{.Image}}' hassio_supervisor || echo "")
 
 runSupervisor() {
diff --git a/hassio_install.sh b/hassio_install.sh
index e24c45c..4b0477c 100755
--- a/hassio_install.sh
+++ b/hassio_install.sh
@@ -24,7 +24,7 @@ command -v nmcli > /dev/null 2>&1 || echo "[Warning] No NetworkManager support o
 function version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; }
 
 # Parse command line parameters
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
     arg="$1"
 
     case $arg in
@@ -133,10 +133,10 @@ systemctl enable hassio-supervisor.service
 # Install Hass.io AppArmor
 if command -v apparmor_parser > /dev/null 2>&1; then
     echo "[Info] Install AppArmor scripts"
-    mkdir -p ${DATA_SHARE}/apparmor
+    mkdir -p "${DATA_SHARE}"/apparmor
     curl -sL ${URL_BIN_APPARMOR} > /usr/sbin/hassio-apparmor
     curl -sL ${URL_SERVICE_APPARMOR} > /etc/systemd/system/hassio-apparmor.service
-    curl -sL ${URL_APPARMOR_PROFILE} > ${DATA_SHARE}/apparmor/hassio-supervisor
+    curl -sL ${URL_APPARMOR_PROFILE} > "${DATA_SHARE}"/apparmor/hassio-supervisor
 
     chmod a+x /usr/sbin/hassio-apparmor
     systemctl enable hassio-apparmor.service