From e7cb317e85435e21b975373cbcfcaefacad76c44 Mon Sep 17 00:00:00 2001
From: doublez13 <zakraise@eng.utah.edu>
Date: Fri, 2 Feb 2024 19:43:10 -0700
Subject: [PATCH] Convert to bin variable

---
 apparmor.d/profiles-m-r/mutt | 50 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/apparmor.d/profiles-m-r/mutt b/apparmor.d/profiles-m-r/mutt
index 3f5f34ec3..eeb27ccef 100644
--- a/apparmor.d/profiles-m-r/mutt
+++ b/apparmor.d/profiles-m-r/mutt
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{exec_path} = /{usr/,}bin/mutt
+@{exec_path} = @{bin}/mutt
 profile mutt @{exec_path} {
   include <abstractions/base>
   include <abstractions/nameservice-strict>
@@ -77,29 +77,29 @@ profile mutt @{exec_path} {
   # Used to exec programs defined in the mailcap.
   # There are countless programs that can be executed from the mailcap.
   # This profile includes only the most basic.
-  /{usr/,}bin/{,ba,da}sh  rix,
+  @{bin}/{,ba,da}sh  rix,
  
   /{usr/,}{s,}bin/sendmail rPUx, 
-  /{usr/,}bin/ispell       rPUx, 
+  @{bin}/ispell       rPUx, 
   # TODO: Add a profile for abook (Most distros don't ship this anymore though)
-  /{usr/,}bin/abook        rPUx, 
+  @{bin}/abook        rPUx, 
  
-  /{usr/,}bin/w3m             rCx -> html-renderer,
-  /{usr/,}bin/lynx            rCx -> html-renderer,
-  /{usr/,}bin/vim             rCx -> editor,
-  /{usr/,}bin/sensible-editor rCx -> editor,
-  /{usr/,}bin/more            rCx -> pager,
-  /{usr/,}bin/less            rCx -> pager,
-  /{usr/,}bin/pager           rCx -> pager,
-  /{usr/,}bin/gpg{2,}         rCx -> gpg, 
-  /{usr/,}bin/pgpewrap        rCx -> gpg,
+  @{bin}/w3m             rCx -> html-renderer,
+  @{bin}/lynx            rCx -> html-renderer,
+  @{bin}/vim             rCx -> editor,
+  @{bin}/sensible-editor rCx -> editor,
+  @{bin}/more            rCx -> pager,
+  @{bin}/less            rCx -> pager,
+  @{bin}/pager           rCx -> pager,
+  @{bin}/gpg{2,}         rCx -> gpg, 
+  @{bin}/pgpewrap        rCx -> gpg,
   
 
   profile html-renderer {
     include <abstractions/base>
 
-    /{usr/,}bin/w3m     mrix,
-    /{usr/,}bin/lynx    mrix,
+    @{bin}/w3m     mrix,
+    @{bin}/lynx    mrix,
     
     owner @{HOME}/.w3m/* rw,
 
@@ -112,11 +112,11 @@ profile mutt @{exec_path} {
     include <abstractions/base>
     include <abstractions/nameservice-strict>
 
-    /{usr/,}bin/sensible-editor        mr,
-    /{usr/,}bin/vim                  mrix,
-    /{usr/,}bin/vim.*                mrix,
-    /{usr/,}bin/{,ba,da}sh            rix,
-    /{usr/,}bin/which{,.debianutils}  rix,
+    @{bin}/sensible-editor        mr,
+    @{bin}/vim                  mrix,
+    @{bin}/vim.*                mrix,
+    @{bin}/{,ba,da}sh            rix,
+    @{bin}/which{,.debianutils}  rix,
 
     /usr/share/vim/{,**} r,
     /usr/share/terminfo/** r,
@@ -143,9 +143,9 @@ profile mutt @{exec_path} {
     include <abstractions/base>
     include <abstractions/consoles>
   
-    /{usr/,}bin/less  mr,
-    /{usr/,}bin/more  mr,
-    /{usr/,}bin/pager mr,
+    @{bin}/less  mr,
+    @{bin}/more  mr,
+    @{bin}/pager mr,
     
     owner @{HOME}/.lesshsQ r,
     owner @{HOME}/.local/state/ r,
@@ -164,8 +164,8 @@ profile mutt @{exec_path} {
     include <abstractions/base>
     include <abstractions/nameservice-strict>
 
-    /{usr/,}bin/gpg{,2}  mrix,
-    /{usr/,}bin/pgpewrap mr,
+    @{bin}/gpg{,2}  mrix,
+    @{bin}/pgpewrap mr,
 
     owner @{HOME}/@{XDG_GPG_DIR}/ rw,
     owner @{HOME}/@{XDG_GPG_DIR}/** rwkl -> @{HOME}/@{XDG_GPG_DIR}/**,