From 477d3488a9e223144ff11f9a2eb87da00554b45b Mon Sep 17 00:00:00 2001 From: ShellCode33 Date: Wed, 26 Jul 2023 23:54:20 +0200 Subject: [PATCH] Replace @{HOME}/.config with @{user_config_dirs} --- apparmor.d/groups/apps/discord | 4 ++-- apparmor.d/groups/apps/telegram-desktop | 2 +- apparmor.d/profiles-a-f/amixer | 2 +- apparmor.d/profiles-a-f/deltachat-desktop | 4 ++-- apparmor.d/profiles-a-f/dring | 6 +++--- apparmor.d/profiles-a-f/dunst | 2 +- apparmor.d/profiles-a-f/fritzing | 2 +- apparmor.d/profiles-g-l/jami-gnome | 2 +- apparmor.d/profiles-m-r/merkaartor | 6 +++--- apparmor.d/profiles-m-r/pulseeffects | 6 +++--- apparmor.d/profiles-m-r/qtox | 2 +- apparmor.d/profiles-s-z/transmission-qt | 6 +++--- dists/ubuntu/abstractions/trash | 8 ++++---- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/apparmor.d/groups/apps/discord b/apparmor.d/groups/apps/discord index af2251b4..bd6a50e7 100644 --- a/apparmor.d/groups/apps/discord +++ b/apparmor.d/groups/apps/discord @@ -8,8 +8,8 @@ include @{DISCORD_LIBDIR} = /usr/share/discord @{DISCORD_LIBDIR} += /usr/share/discord-ptb /opt/discord -@{DISCORD_HOMEDIR} = @{HOME}/.config/discord -@{DISCORD_HOMEDIR} += @{HOME}/.config/discordptb +@{DISCORD_HOMEDIR} = @{user_config_dirs}/discord +@{DISCORD_HOMEDIR} += @{user_config_dirs}/discordptb @{DISCORD_CACHEDIR} = @{HOME}/.cache/discord @{exec_path} = @{DISCORD_LIBDIR}/Discord{,PTB} @{bin}/discord{,-ptb} diff --git a/apparmor.d/groups/apps/telegram-desktop b/apparmor.d/groups/apps/telegram-desktop index c2234b09..69292d57 100644 --- a/apparmor.d/groups/apps/telegram-desktop +++ b/apparmor.d/groups/apps/telegram-desktop @@ -77,7 +77,7 @@ profile telegram-desktop @{exec_path} { /usr/share/hwdata/pnp.ids r, - owner @{HOME}/.config/qt5ct/{,**} r, + owner @{user_config_dirs}/qt5ct/{,**} r, /usr/share/qt5ct/** r, # Allowed apps to open diff --git a/apparmor.d/profiles-a-f/amixer b/apparmor.d/profiles-a-f/amixer index c840fd78..6dacb53f 100644 --- a/apparmor.d/profiles-a-f/amixer +++ b/apparmor.d/profiles-a-f/amixer @@ -21,7 +21,7 @@ profile amixer @{exec_path} { owner @{HOME}/.Xauthority r, - owner @{HOME}/.config/pulse/ r, + owner @{user_config_dirs}/pulse/ r, owner @{PROC}/@{pid}/task/@{tid}/comm rw, diff --git a/apparmor.d/profiles-a-f/deltachat-desktop b/apparmor.d/profiles-a-f/deltachat-desktop index 126173d8..e2c2b23b 100644 --- a/apparmor.d/profiles-a-f/deltachat-desktop +++ b/apparmor.d/profiles-a-f/deltachat-desktop @@ -44,8 +44,8 @@ profile deltachat-desktop @{exec_path} { @{DCD_LIBDIR}/resources/app.asar.unpacked/node_modules/**.so.[0-9]* mr, @{DCD_LIBDIR}/chrome-sandbox rPx, - owner @{HOME}/.config/DeltaChat/ rw, - owner @{HOME}/.config/DeltaChat/** rwk, + owner @{user_config_dirs}/DeltaChat/ rw, + owner @{user_config_dirs}/DeltaChat/** rwk, owner /tmp/@{hex}/ rw, owner /tmp/@{hex}/db.sqlite-blobs/ rw, diff --git a/apparmor.d/profiles-a-f/dring b/apparmor.d/profiles-a-f/dring index c2c68ca5..5afd8275 100644 --- a/apparmor.d/profiles-a-f/dring +++ b/apparmor.d/profiles-a-f/dring @@ -19,9 +19,9 @@ profile dring @{exec_path} { @{exec_path} mr, - owner @{HOME}/.config/ring/ rw, - owner @{HOME}/.config/jami/dring.yml rw, - owner @{HOME}/.config/jami/dring.yml.bak w, + owner @{user_config_dirs}/ring/ rw, + owner @{user_config_dirs}/jami/dring.yml rw, + owner @{user_config_dirs}/jami/dring.yml.bak w, owner @{HOME}/.local/share/jami/ r, @{sys}/class/ r, diff --git a/apparmor.d/profiles-a-f/dunst b/apparmor.d/profiles-a-f/dunst index 5110c092..3929afff 100644 --- a/apparmor.d/profiles-a-f/dunst +++ b/apparmor.d/profiles-a-f/dunst @@ -16,7 +16,7 @@ profile dunst @{exec_path} { @{exec_path} mr, /etc/xdg/dunst/dunstrc r, - owner @{HOME}/.config/dunst/dunstrc r, + owner @{user_config_dirs}/dunst/dunstrc r, owner @{HOME}/.Xauthority r, diff --git a/apparmor.d/profiles-a-f/fritzing b/apparmor.d/profiles-a-f/fritzing index 9fe267c2..a0a3ac66 100644 --- a/apparmor.d/profiles-a-f/fritzing +++ b/apparmor.d/profiles-a-f/fritzing @@ -29,7 +29,7 @@ profile fritzing @{exec_path} { @{exec_path} mrix, owner @{user_config_dirs}/Fritzing/ rw, - owner @{user_config_dirs}/Fritzing/** rwkl -> @{HOME}/.config/Fritzing/**, + owner @{user_config_dirs}/Fritzing/** rwkl -> @{user_config_dirs}/Fritzing/**, owner @{HOME}/@{XDG_DOCUMENTS_DIR}/Fritzing/ rw, owner @{HOME}/@{XDG_DOCUMENTS_DIR}/Fritzing/** rw, diff --git a/apparmor.d/profiles-g-l/jami-gnome b/apparmor.d/profiles-g-l/jami-gnome index 80a0e919..ee229604 100644 --- a/apparmor.d/profiles-g-l/jami-gnome +++ b/apparmor.d/profiles-g-l/jami-gnome @@ -31,7 +31,7 @@ profile jami-gnome @{exec_path} { owner @{HOME}/.local/share/jami/ rw, owner @{HOME}/.local/share/jami/** rwkl -> @{HOME}/.local/share/jami/, - owner @{HOME}/.config/autostart/jami-gnome.desktop w, + owner @{user_config_dirs}/autostart/jami-gnome.desktop w, owner @{HOME}/.local/share/ r, owner @{HOME}/.local/share/webkitgtk/deviceidhashsalts/1/ r, diff --git a/apparmor.d/profiles-m-r/merkaartor b/apparmor.d/profiles-m-r/merkaartor index d9556b67..d9909288 100644 --- a/apparmor.d/profiles-m-r/merkaartor +++ b/apparmor.d/profiles-m-r/merkaartor @@ -33,8 +33,8 @@ profile merkaartor @{exec_path} { /usr/share/merkaartor/{,**} r, - owner @{HOME}/.config/Merkaartor/ rw, - owner @{HOME}/.config/Merkaartor/* rwkl -> @{HOME}/.config/Merkaartor/, + owner @{user_config_dirs}/Merkaartor/ rw, + owner @{user_config_dirs}/Merkaartor/* rwkl -> @{user_config_dirs}/Merkaartor/, owner @{HOME}/.merkaartor/ rw, owner @{HOME}/.merkaartor/* rw, @@ -45,7 +45,7 @@ profile merkaartor @{exec_path} { /etc/machine-id r, # To configure Qt5 settings (theme, font, icons, etc.) under DE/WM without Qt integration - owner @{HOME}/.config/qt5ct/{,**} r, + owner @{user_config_dirs}/qt5ct/{,**} r, /usr/share/qt5ct/** r, /usr/share/hwdata/pnp.ids r, diff --git a/apparmor.d/profiles-m-r/pulseeffects b/apparmor.d/profiles-m-r/pulseeffects index 1ee24af2..1d270b8b 100644 --- a/apparmor.d/profiles-m-r/pulseeffects +++ b/apparmor.d/profiles-m-r/pulseeffects @@ -24,10 +24,10 @@ profile pulseeffects @{exec_path} { /etc/pipewire/pipewire.conf r, /etc/pipewire/client.conf r, - owner @{HOME}/.config/PulseEffects/ rw, - owner @{HOME}/.config/PulseEffects/** rw, + owner @{user_config_dirs}/PulseEffects/ rw, + owner @{user_config_dirs}/PulseEffects/** rw, - owner @{HOME}/.config/autostart/pulseeffects-service.desktop w, + owner @{user_config_dirs}/autostart/pulseeffects-service.desktop w, owner @{PROC}/@{pid}/cmdline r, owner @{PROC}/@{pid}/fd/ r, diff --git a/apparmor.d/profiles-m-r/qtox b/apparmor.d/profiles-m-r/qtox index 9365233c..b78851a9 100644 --- a/apparmor.d/profiles-m-r/qtox +++ b/apparmor.d/profiles-m-r/qtox @@ -41,7 +41,7 @@ profile qtox @{exec_path} { owner @{user_cache_dirs}/qTox/qtox.log rw, owner @{user_config_dirs}/tox/ rw, - owner @{user_config_dirs}/tox/** rwkl -> @{HOME}/.config/tox/**, + owner @{user_config_dirs}/tox/** rwkl -> @{user_config_dirs}/tox/**, owner @{user_config_dirs}/autostart/qTox*.desktop rw, diff --git a/apparmor.d/profiles-s-z/transmission-qt b/apparmor.d/profiles-s-z/transmission-qt index 20597848..d9f2e6e5 100644 --- a/apparmor.d/profiles-s-z/transmission-qt +++ b/apparmor.d/profiles-s-z/transmission-qt @@ -37,8 +37,8 @@ profile transmission-qt @{exec_path} { owner @{user_torrents_dirs}/ r, owner @{user_torrents_dirs}/** rw, - owner @{HOME}/.config/transmission/ rw, - owner @{HOME}/.config/transmission/** rwk, + owner @{user_config_dirs}/transmission/ rw, + owner @{user_config_dirs}/transmission/** rwk, owner @{HOME}/.cache/ rw, owner @{HOME}/.cache/transmission/ rw, @@ -53,7 +53,7 @@ profile transmission-qt @{exec_path} { @{PROC}/sys/kernel/random/uuid r, # To configure Qt5 settings (theme, font, icons, etc.) under DE/WM without Qt integration - owner @{HOME}/.config/qt5ct/{,**} r, + owner @{user_config_dirs}/qt5ct/{,**} r, /usr/share/qt5ct/** r, /usr/share/hwdata/pnp.ids r, diff --git a/dists/ubuntu/abstractions/trash b/dists/ubuntu/abstractions/trash index 68a43c06..3ca1198a 100644 --- a/dists/ubuntu/abstractions/trash +++ b/dists/ubuntu/abstractions/trash @@ -2,10 +2,10 @@ abi , # requires - owner @{HOME}/.config/trashrc rw, - owner @{HOME}/.config/trashrc.lock rwk, - owner @{HOME}/.config/#[0-9]*[0-9] rwk, - owner @{HOME}/.config/trashrc.* rwl -> @{HOME}/.config/#[0-9]*[0-9], + owner @{user_config_dirs}/trashrc rw, + owner @{user_config_dirs}/trashrc.lock rwk, + owner @{user_config_dirs}/#[0-9]*[0-9] rwk, + owner @{user_config_dirs}/trashrc.* rwl -> @{user_config_dirs}/#[0-9]*[0-9], owner @{run}/user/@{uid}/#[0-9]*[0-9] rw, owner @{run}/user/@{uid}/trash.so*.[0-9].slave-socket rwl -> @{run}/user/@{uid}/#[0-9]*[0-9],