From 0d6078b5359bf903451da069176baac6270e4bbc Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Wed, 24 Apr 2019 13:54:23 +0200
Subject: [PATCH] Fix lint

---
 azure-pipelines.yml     |  2 +-
 files/hassio-apparmor   | 22 +++++++++++-----------
 files/hassio-supervisor | 12 +++++++-----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c59834d..29fc469 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,5 +21,5 @@ jobs:
   - script: |
       sudo docker run --rm -i \
         -v $(pwd):/mnt:ro koalaman/shellcheck:$(versionShellCheck) \
-        hassio_installer.sh files/hassio-apparmor files/hassio-supervisor
+        hassio_install.sh files/hassio-apparmor files/hassio-supervisor
     displayName: 'Run ShellCheck'
diff --git a/files/hassio-apparmor b/files/hassio-apparmor
index 55f54b4..00788a6 100644
--- a/files/hassio-apparmor
+++ b/files/hassio-apparmor
@@ -6,7 +6,7 @@ CONFIG_FILE=/etc/hassio.json
 
 # Read configs
 DATA="$(jq --raw-output '.data // "/usr/share/hassio"' ${CONFIG_FILE})"
-PROFILES_DIR=${DATA}/apparmor
+PROFILES_DIR="${DATA}/apparmor"
 CACHE_DIR="${PROFILES_DIR}/cache"
 REMOVE_DIR="${PROFILES_DIR}/remove"
 
@@ -17,31 +17,31 @@ if ! command -v apparmor_parser > /dev/null 2>&1; then
 fi
 
 # Check folder structure
-mkdir -p ${PROFILES_DIR}
-mkdir -p ${CACHE_DIR}
-mkdir -p ${REMOVE_DIR}
+mkdir -p "${PROFILES_DIR}"
+mkdir -p "${CACHE_DIR}"
+mkdir -p "${REMOVE_DIR}"
 
 # Load/Update exists/new profiles
-for profile in ${PROFILES_DIR}/*; do
-    if [ ! -f ${profile} ]; then
+for profile in "${PROFILES_DIR}"/*; do
+    if [ ! -f "${profile}" ]; then
         continue
     fi
 
     # Load Profile
-    if ! apparmor_parser -r -W -L ${CACHE_DIR} ${profile}; then
+    if ! apparmor_parser -r -W -L "${CACHE_DIR}" "${profile}"; then
         echo "[Error]: Can't load profile ${profile}"
     fi
 done
 
 # Cleanup old profiles
-for profile in ${REMOVE_DIR}/*; do
-    if [ ! -f ${profile} ]; then
+for profile in "${REMOVE_DIR}"/*; do
+    if [ ! -f "${profile}" ]; then
         continue
     fi
 
     # Unload Profile
-    if apparmor_parser -R -W -L ${CACHE_DIR} ${profile}; then
-        if rm ${profile}; then
+    if apparmor_parser -R -W -L "${CACHE_DIR}" "${profile}"; then
+        if rm -f "${profile}"; then
             continue
         fi
     fi
diff --git a/files/hassio-supervisor b/files/hassio-supervisor
index 4efc36a..241c248 100644
--- a/files/hassio-supervisor
+++ b/files/hassio-supervisor
@@ -22,19 +22,21 @@ HASSIO_CONTAINER_ID=$(docker inspect --format='{{.Image}}' hassio_supervisor ||
 
 runSupervisor() {
     docker rm --force hassio_supervisor || true
+
+    # shellcheck disable=SC2086
     docker run --name hassio_supervisor \
         --privileged \
         $APPARMOR \
         --security-opt seccomp=unconfined \
         -v /var/run/docker.sock:/var/run/docker.sock \
         -v /var/run/dbus:/var/run/dbus \
-        -v ${HASSIO_DATA}:/data \
-        -e SUPERVISOR_SHARE=${HASSIO_DATA} \
+        -v "${HASSIO_DATA}":/data \
+        -e SUPERVISOR_SHARE="${HASSIO_DATA}" \
         -e SUPERVISOR_NAME=hassio_supervisor \
-        -e HOMEASSISTANT_REPOSITORY=${HOMEASSISTANT} \
-        ${SUPERVISOR}
+        -e HOMEASSISTANT_REPOSITORY="${HOMEASSISTANT}" \
+        "${SUPERVISOR}"
 }
 
 # Run supervisor
-mkdir -p ${HASSIO_DATA}
+mkdir -p "${HASSIO_DATA}"
 ([ "${HASSIO_IMAGE_ID}" = "${HASSIO_CONTAINER_ID}" ] && docker start --attach hassio_supervisor) || runSupervisor