Replace shells with new sh_path variable

Signed-off-by: Jeroen Rijken <jeroen.rijken@xs4all.nl>
2024-02-11 15:34:46 +01:00 · 2024-02-11 15:34:46 +01:00 · 40b171ee94
commit 40b171ee94
parent 3b1b187d13
315 changed files with 415 additions and 369 deletions
--- a/apparmor.d/profiles-a-f/aa-teardown
+++ b/apparmor.d/profiles-a-f/aa-teardown
@ -15,7 +15,7 @@ profile aa-teardown @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,
  @{lib}/apparmor/apparmor.systemd rPx,

  /usr/share/terminfo/** r,
--- a/apparmor.d/profiles-a-f/adduser
+++ b/apparmor.d/profiles-a-f/adduser
@ -25,7 +25,7 @@ profile adduser @{exec_path} {
  @{exec_path} r,
  @{bin}/perl r,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,
  @{bin}/find       rix,
  @{bin}/logger     rix,
  @{bin}/rm         rix,
--- a/apparmor.d/profiles-a-f/adequate
+++ b/apparmor.d/profiles-a-f/adequate
@ -77,7 +77,7 @@ profile adequate @{exec_path} flags=(complain) {

    @{bin}/adequate   rPx,

-    @{bin}/{,ba,da}sh rix,
+    @{sh_path}        rix,
    @{bin}/stty       rix,
    @{bin}/locale     rix,

--- a/apparmor.d/profiles-a-f/anacron
+++ b/apparmor.d/profiles-a-f/anacron
@ -13,7 +13,7 @@ profile anacron @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh  rix,
+  @{sh_path}         rix,
  @{bin}/run-parts   rCx -> run-parts,

  / r,
--- a/apparmor.d/profiles-a-f/anyremote
+++ b/apparmor.d/profiles-a-f/anyremote
@ -21,7 +21,7 @@ profile anyremote @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,
  @{bin}/cat        rix,
  @{bin}/rm         rix,
  @{bin}/{,e}grep   rix,
--- a/apparmor.d/profiles-a-f/apparmor.systemd
+++ b/apparmor.d/profiles-a-f/apparmor.systemd
@ -17,7 +17,7 @@ profile apparmor.systemd @{exec_path} flags=(complain) {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh           rix,
+  @{sh_path}                  rix,
  @{bin}/{,e}grep             rix,
  @{bin}/aa-status            rPx,
  @{bin}/apparmor_parser      rPx,
--- a/apparmor.d/profiles-a-f/arduino
+++ b/apparmor.d/profiles-a-f/arduino
@ -30,7 +30,7 @@ profile arduino @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh         rix,
+  @{sh_path}                rix,
  @{bin}/id                 rix,
  @{bin}/{,e}grep           rix,
  @{bin}/groups             rix,
@ -116,7 +116,7 @@ profile arduino @{exec_path} {

    @{bin}/xdg-open mr,

-    @{bin}/{,ba,da}sh      rix,
+    @{sh_path}             rix,
    @{bin}/{m,g,}awk       rix,
    @{bin}/readlink        rix,
    @{bin}/basename        rix,
--- a/apparmor.d/profiles-a-f/aspell-autobuildhash
+++ b/apparmor.d/profiles-a-f/aspell-autobuildhash
@ -16,7 +16,7 @@ profile aspell-autobuildhash @{exec_path} flags=(complain) {
  @{exec_path} r,
  @{bin}/perl r,

-  @{bin}/{,ba,da}sh           rix,
+  @{sh_path}                  rix,
  @{bin}/basename             rix,
  @{bin}/gzip                 rix,
  @{bin}/precat               rix,
@ -51,7 +51,7 @@ profile aspell-autobuildhash @{exec_path} flags=(complain) {

    @{bin}/aspell-autobuildhash rPx,

-    @{bin}/{,ba,da}sh rix,
+    @{sh_path}        rix,
    @{bin}/stty       rix,
    @{bin}/locale     rix,

--- a/apparmor.d/profiles-a-f/atd
+++ b/apparmor.d/profiles-a-f/atd
@ -26,7 +26,7 @@ profile atd @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh    rix,
+  @{sh_path}           rix,
  @{bin}/sendmail     rPUx,

  @{etc_ro}/environment r,
--- a/apparmor.d/profiles-a-f/atril
+++ b/apparmor.d/profiles-a-f/atril
@ -36,7 +36,7 @@ profile atril @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh      rix,
+  @{sh_path}             rix,

  @{bin}/atril-previewer rPx,

--- a/apparmor.d/profiles-a-f/augenrules
+++ b/apparmor.d/profiles-a-f/augenrules
@ -13,7 +13,7 @@ profile augenrules @{exec_path} flags=(attach_disconnected) {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh  rix,
+  @{sh_path}         rix,
  @{bin}/{,e,f}grep  rix,
  @{bin}/{,g,m}awk   rix,
  @{bin}/auditctl    rPx,
--- a/apparmor.d/profiles-a-f/birdtray
+++ b/apparmor.d/profiles-a-f/birdtray
@ -79,7 +79,7 @@ profile birdtray @{exec_path} {

    @{bin}/xdg-open mr,

-    @{bin}/{,ba,da}sh      rix,
+    @{sh_path}             rix,
    @{bin}/{m,g,}awk       rix,
    @{bin}/readlink        rix,
    @{bin}/basename        rix,
--- a/apparmor.d/profiles-a-f/cawbird
+++ b/apparmor.d/profiles-a-f/cawbird
@ -29,7 +29,7 @@ profile cawbird @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh  rix,
+  @{sh_path}         rix,

  @{bin}/xdg-open    rCx -> open,
  @{bin}/exo-open    rCx -> open,
@ -54,7 +54,7 @@ profile cawbird @{exec_path} {

    @{bin}/xdg-open mr,

-    @{bin}/{,ba,da}sh      rix,
+    @{sh_path}             rix,
    @{bin}/{m,g,}awk       rix,
    @{bin}/readlink        rix,
    @{bin}/basename        rix,
--- a/apparmor.d/profiles-a-f/check-bios-nx
+++ b/apparmor.d/profiles-a-f/check-bios-nx
@ -17,7 +17,7 @@ profile check-bios-nx @{exec_path} {
  capability dac_override,

  @{exec_path} r,
-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,

  @{bin}/uname      rix,
  @{bin}/{,e}grep   rix,
--- a/apparmor.d/profiles-a-f/check-support-status
+++ b/apparmor.d/profiles-a-f/check-support-status
@ -13,7 +13,7 @@ profile check-support-status @{exec_path} {
  include <abstractions/consoles>

  @{exec_path} rix,
-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,

  @{bin}/           r,
  @{bin}/gettext.sh r,
--- a/apparmor.d/profiles-a-f/check-support-status-hook
+++ b/apparmor.d/profiles-a-f/check-support-status-hook
@ -14,7 +14,7 @@ profile check-support-status-hook @{exec_path} {
  include <abstractions/nameservice-strict>

  @{exec_path} r,
-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,

  @{bin}/           r,
  @{bin}/getent     rix,
@ -72,7 +72,7 @@ profile check-support-status-hook @{exec_path} {
    /usr/share/debian-security-support/ r,
    /usr/share/debian-security-support/check-support-status.hook rPx,

-    @{bin}/{,ba,da}sh rix,
+    @{sh_path}        rix,
    @{bin}/stty       rix,
    @{bin}/locale     rix,

@ -113,7 +113,7 @@ profile check-support-status-hook @{exec_path} {

    @{bin}/runuser mr,

-    @{bin}/{,ba,da}sh rix,
+    @{sh_path}        rix,

    @{bin}/check-support-status rPx,

--- a/apparmor.d/profiles-a-f/claws-mail
+++ b/apparmor.d/profiles-a-f/claws-mail
@ -23,7 +23,7 @@ profile claws-mail @{exec_path} flags=(complain) {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,
  @{bin}/which{,.debianutils}      rix,

  @{bin}/gpg{,2}    rCx -> gpg,
--- a/apparmor.d/profiles-a-f/code-extension-git-askpass
+++ b/apparmor.d/profiles-a-f/code-extension-git-askpass
@ -15,7 +15,7 @@ profile code-extension-git-askpass @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh               rix,
+  @{sh_path}                      rix,
  @{bin}/cat                      rix,
  @{bin}/mktemp                   rix,
  @{bin}/rm                       rix,
--- a/apparmor.d/profiles-a-f/code-extension-git-editor
+++ b/apparmor.d/profiles-a-f/code-extension-git-editor
@ -12,7 +12,7 @@ profile code-extension-git-editor @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh               rix,
+  @{sh_path}                      rix,
  @{lib}/electron@{int}/electron  rix,

  @{sys}/devices/system/cpu/cpufreq/policy@{int}/cpuinfo_max_freq r,
--- a/apparmor.d/profiles-a-f/code-wrapper
+++ b/apparmor.d/profiles-a-f/code-wrapper
@ -13,7 +13,7 @@ profile code-wrapper @{exec_path} {

  @{exec_path} r,

-  @{bin}/{,ba,da}sh               rix,
+  @{sh_path}                      rix,
  @{lib}/electron@{int}/electron  rPx -> code,

  owner @{user_config_dirs}/code-flags.conf r,
--- a/apparmor.d/profiles-a-f/conky
+++ b/apparmor.d/profiles-a-f/conky
@ -33,7 +33,7 @@ profile conky @{exec_path} {
  @{exec_path} mr,

  # Needed tools to render conky output
-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,
  @{bin}/cp         rix,
  @{bin}/rm         rix,
  @{bin}/sed        rix,
@ -169,7 +169,7 @@ profile conky @{exec_path} {
    @{bin}/lynx mr,
    @{bin}/w3m  mr,

-    @{bin}/{,ba,da}sh rix,
+    @{sh_path}        rix,

    /etc/mime.types r,
    /etc/mailcap r,
--- a/apparmor.d/profiles-a-f/convertall
+++ b/apparmor.d/profiles-a-f/convertall
@ -22,7 +22,7 @@ profile convertall @{exec_path} {
  include <abstractions/nameservice-strict>

  @{exec_path} r,
-  @{bin}/{,ba,da}sh     rix,
+  @{sh_path}            rix,

  @{bin}/python3.@{int} rix,

--- a/apparmor.d/profiles-a-f/cups-backend-pdf
+++ b/apparmor.d/profiles-a-f/cups-backend-pdf
@ -22,7 +22,7 @@ profile cups-backend-pdf @{exec_path} {

  @{exec_path} mr,
 
-  @{bin}/{,ba,da}sh      rix,
+  @{sh_path}             rix,
  @{bin}/cp              rix,
  @{bin}/gs              rix,
  @{bin}/gsc             rix,
--- a/apparmor.d/profiles-a-f/cupsd
+++ b/apparmor.d/profiles-a-f/cupsd
@ -45,7 +45,7 @@ profile cupsd @{exec_path} flags=(attach_disconnected) {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh          rix,
+  @{sh_path}                 rix,
  @{bin}/cat                 rix,
  @{bin}/chmod               rix,
  @{bin}/cp                  rix,
--- a/apparmor.d/profiles-a-f/czkawka-gui
+++ b/apparmor.d/profiles-a-f/czkawka-gui
@ -44,7 +44,7 @@ profile czkawka-gui @{exec_path} {

    @{bin}/xdg-open mr,

-    @{bin}/{,ba,da}sh      rix,
+    @{sh_path}             rix,
    @{bin}/{m,g,}awk       rix,
    @{bin}/readlink        rix,
    @{bin}/basename        rix,
--- a/apparmor.d/profiles-a-f/ddclient
+++ b/apparmor.d/profiles-a-f/ddclient
@ -18,7 +18,7 @@ profile ddclient @{exec_path} {
  @{exec_path} r,
  @{bin}/perl r,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,
  @{bin}/logger     rix,

  /etc/ddclient.conf r,
--- a/apparmor.d/profiles-a-f/deltachat-desktop
+++ b/apparmor.d/profiles-a-f/deltachat-desktop
@ -88,7 +88,7 @@ profile deltachat-desktop @{exec_path} {

    @{bin}/xdg-open mr,

-    @{bin}/{,ba,da}sh      rix,
+    @{sh_path}             rix,
    @{bin}/{m,g,}awk       rix,
    @{bin}/readlink        rix,
    @{bin}/basename        rix,
--- a/apparmor.d/profiles-a-f/deluser
+++ b/apparmor.d/profiles-a-f/deluser
@ -23,7 +23,7 @@ profile deluser @{exec_path} {
  @{exec_path} r,
  @{bin}/perl r,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,

  @{bin}/userdel   rPx,
  @{bin}/groupdel  rPx,
--- a/apparmor.d/profiles-a-f/dhclient-script
+++ b/apparmor.d/profiles-a-f/dhclient-script
@ -20,7 +20,7 @@ profile dhclient-script @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh   mrix,
+  @{sh_path}          mrix,
  @{bin}/chmod         rix,
  @{bin}/chown         rix,
  @{bin}/chronyc       rPUx,
--- a/apparmor.d/profiles-a-f/dkms
+++ b/apparmor.d/profiles-a-f/dkms
@ -51,7 +51,7 @@ profile dkms @{exec_path} flags=(attach_disconnected) {
  @{bin}/wc         rix,
  @{bin}/xargs      rix,
  @{bin}/{,@{multiarch}-}* rix,
-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,
  @{bin}/{,e,f}grep rix,
  @{bin}/{,g,m}awk  rix,
  @{bin}/update-secureboot-policy rPUx,
--- a/apparmor.d/profiles-a-f/dkms-autoinstaller
+++ b/apparmor.d/profiles-a-f/dkms-autoinstaller
@ -14,7 +14,7 @@ profile dkms-autoinstaller @{exec_path} {

  @{exec_path} rm,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,
  @{bin}/dkms       rPx,
  @{bin}/echo       rix,
  @{bin}/plymouth   rix,
--- a/apparmor.d/profiles-a-f/dlocate
+++ b/apparmor.d/profiles-a-f/dlocate
@ -14,7 +14,7 @@ profile dlocate @{exec_path} {
  include <abstractions/nameservice-strict>

  @{exec_path} rix,
-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,

  @{bin}/getopt     rix,
  @{bin}/{,e}grep   rix,
--- a/apparmor.d/profiles-a-f/dmesg
+++ b/apparmor.d/profiles-a-f/dmesg
@ -17,7 +17,7 @@ profile dmesg @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,
  @{bin}/less       rPx -> child-pager,

  /dev/kmsg r,
--- a/apparmor.d/profiles-a-f/e2fsck
+++ b/apparmor.d/profiles-a-f/e2fsck
@ -19,7 +19,7 @@ profile e2fsck @{exec_path} {
  @{exec_path} mr,

  # To check for badblocks
-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,
  @{bin}/badblocks  rPx,

  /usr/share/file/misc/magic.mgc r,
--- a/apparmor.d/profiles-a-f/e2scrub_all
+++ b/apparmor.d/profiles-a-f/e2scrub_all
@ -17,7 +17,7 @@ profile e2scrub_all @{exec_path} flags=(attach_disconnected) {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh  r,
+  @{sh_path}         r,
  @{bin}/readlink  rix,

  /etc/e2scrub.conf r,
--- a/apparmor.d/profiles-a-f/eject
+++ b/apparmor.d/profiles-a-f/eject
@ -17,7 +17,7 @@ profile eject @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,

  @{lib}/eject/dmcrypt-get-device rPx,

--- a/apparmor.d/profiles-a-f/element
+++ b/apparmor.d/profiles-a-f/element
@ -28,7 +28,7 @@ profile element @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh r,
+  @{sh_path}        r,
  @{bin}/electron@{int} rix,
  @{lib}/electron@{int}/{,**} r,
  @{lib}/electron@{int}/electron  rix,
--- a/apparmor.d/profiles-a-f/engrampa
+++ b/apparmor.d/profiles-a-f/engrampa
@ -43,7 +43,7 @@ profile engrampa @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh    rix,
+  @{sh_path}           rix,
  @{bin}/ls            rix,
  @{bin}/rm            rix,
  @{bin}/mv            rix,
--- a/apparmor.d/profiles-a-f/etckeeper
+++ b/apparmor.d/profiles-a-f/etckeeper
@ -17,7 +17,7 @@ profile etckeeper @{exec_path} {

  @{exec_path} mrix,

-  @{bin}/{,ba,da}sh     rix,
+  @{sh_path}            rix,
  @{bin}/{,e}grep       rix,
  @{bin}/cat            rix,
  @{bin}/chmod          rix,
--- a/apparmor.d/profiles-a-f/evince
+++ b/apparmor.d/profiles-a-f/evince
@ -35,7 +35,7 @@ profile evince @{exec_path} {

  @{exec_path} rix,

-  @{bin}/{,ba,da}sh          rix,
+  @{sh_path}                 rix,
  @{bin}/gio-launch-desktop  rPx,
  @{open_path}               rPx -> child-open,

--- a/apparmor.d/profiles-a-f/execute-dput
+++ b/apparmor.d/profiles-a-f/execute-dput
@ -17,7 +17,7 @@ profile execute-dput @{exec_path} flags=(complain) {

  @{bin}/python3.@{int} r,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,
  @{bin}/dpkg       rPx -> child-dpkg,
  @{bin}/gpg{,2}    rCx -> gpg,
  @{bin}/gpgconf    rCx -> gpg,
--- a/apparmor.d/profiles-a-f/f3fix
+++ b/apparmor.d/profiles-a-f/f3fix
@ -26,7 +26,7 @@ profile f3fix @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh  rix,
+  @{sh_path}         rix,

  @{bin}/dmidecode  rPx,

--- a/apparmor.d/profiles-a-f/fail2ban-server
+++ b/apparmor.d/profiles-a-f/fail2ban-server
@ -20,7 +20,7 @@ profile fail2ban-server @{exec_path} flags=(attach_disconnected) {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh         rix,
+  @{sh_path}                rix,
  @{bin}/xtables-nft-multi  rix,
  @{bin}/iptables           rix,

--- a/apparmor.d/profiles-a-f/fatresize
+++ b/apparmor.d/profiles-a-f/fatresize
@ -24,7 +24,7 @@ profile fatresize @{exec_path} {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh  rix,
+  @{sh_path}         rix,

  @{bin}/dmidecode  rPx,

--- a/apparmor.d/profiles-a-f/firecfg
+++ b/apparmor.d/profiles-a-f/firecfg
@ -18,7 +18,7 @@ profile firecfg @{exec_path} flags=(attach_disconnected) {

  @{exec_path} mr,

-  @{bin}/{,ba,da}sh  rix,
+  @{sh_path}         rix,
  @{bin}/apparmor_parser rPx,

  /etc/login.defs r,
--- a/apparmor.d/profiles-a-f/frontend
+++ b/apparmor.d/profiles-a-f/frontend
@ -23,7 +23,7 @@ profile frontend @{exec_path} flags=(complain) {
  @{exec_path} r,
  @{bin}/perl r,

-  @{bin}/{,ba,da}sh  rix,
+  @{sh_path}         rix,
  @{bin}/hostname    rix,
  @{bin}/locale      rix,
  @{bin}/lsb_release rPx -> lsb_release,
--- a/apparmor.d/profiles-a-f/fsck-btrfs
+++ b/apparmor.d/profiles-a-f/fsck-btrfs
@ -13,7 +13,7 @@ profile fsck-btrfs @{exec_path} {

  @{exec_path} r,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,

  /etc/fstab r,

--- a/apparmor.d/profiles-a-f/fsck-ext4
+++ b/apparmor.d/profiles-a-f/fsck-ext4
@ -12,7 +12,7 @@ profile fsck-ext4 @{exec_path} {

  @{exec_path} rm,

-  @{bin}/{,ba,da}sh rix,
+  @{sh_path}        rix,

  /etc/fstab r,