From cf37577f61ab717ebb6a167fed551d4ad8ac6229 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Tue, 2 Nov 2021 18:43:02 +0100
Subject: [PATCH] Simplify AppArmor handler with new OS-Agent (#165)

* Simplify AppArmor handler with new OS-Agent

* improve grammar

* bump version number

Co-authored-by: Matheson Steplock <ikifar2012@users.noreply.github.com>
---
 homeassistant-supervised/DEBIAN/control       |  2 +-
 .../usr/sbin/hassio-apparmor                  | 25 +------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/homeassistant-supervised/DEBIAN/control b/homeassistant-supervised/DEBIAN/control
index a7358ff..b3ad81b 100755
--- a/homeassistant-supervised/DEBIAN/control
+++ b/homeassistant-supervised/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: homeassistant-supervised
 Section: base
-Version: 1.0.1
+Version: 1.0.2
 Priority: optional
 Architecture: all
 Depends: curl, bash, docker-ce, dbus, network-manager, apparmor, jq, systemd, os-agent
diff --git a/homeassistant-supervised/usr/sbin/hassio-apparmor b/homeassistant-supervised/usr/sbin/hassio-apparmor
index a2de3e9..8f62c51 100644
--- a/homeassistant-supervised/usr/sbin/hassio-apparmor
+++ b/homeassistant-supervised/usr/sbin/hassio-apparmor
@@ -8,20 +8,12 @@ CONFIG_FILE=%%HASSIO_CONFIG%%
 DATA="$(jq --raw-output '.data // "/usr/share/hassio"' ${CONFIG_FILE})"
 PROFILES_DIR="${DATA}/apparmor"
 CACHE_DIR="${PROFILES_DIR}/cache"
-REMOVE_DIR="${PROFILES_DIR}/remove"
-
-# Exists AppArmor
-if ! command -v apparmor_parser > /dev/null 2>&1; then
-    echo "[Warning]: No apparmor_parser on host system!"
-    exit 0
-fi
 
 # Check folder structure
 mkdir -p "${PROFILES_DIR}"
 mkdir -p "${CACHE_DIR}"
-mkdir -p "${REMOVE_DIR}"
 
-# Load/Update exists/new profiles
+# Load existing profiles
 for profile in "${PROFILES_DIR}"/*; do
     if [ ! -f "${profile}" ]; then
         continue
@@ -32,18 +24,3 @@ for profile in "${PROFILES_DIR}"/*; do
         echo "[Error]: Can't load profile ${profile}"
     fi
 done
-
-# Cleanup old profiles
-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 -f "${profile}"; then
-            continue
-        fi
-    fi
-    echo "[Error]: Can't remove profile ${profile}"
-done