mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 16:35:02 +01:00
Rename @{usr_share} → @{system_share_dirs} and @{home_local_share} → @{user_share_dirs}.
Thanks a lot to Simon McVittie for the much better names suggestion.
This commit is contained in:
parent
51f2259c08
commit
34dbe372c5
2 changed files with 21 additions and 12 deletions
|
@ -10,12 +10,12 @@
|
|||
# ------------------------------------------------------------------
|
||||
|
||||
# system configuration
|
||||
@{usr_share}/applications/{**,} r,
|
||||
@{usr_share}/icons/{**,} r,
|
||||
@{usr_share}/pixmaps/{**,} r,
|
||||
@{system_share_dirs}/applications/{**,} r,
|
||||
@{system_share_dirs}/icons/{**,} r,
|
||||
@{system_share_dirs}/pixmaps/{**,} r,
|
||||
|
||||
# this should probably go elsewhere
|
||||
@{usr_share}/mime/** r,
|
||||
@{system_share_dirs}/mime/** r,
|
||||
|
||||
# per-user configurations
|
||||
owner @{HOME}/.icons/ r,
|
||||
|
@ -23,6 +23,6 @@
|
|||
owner @{HOME}/.local/share/recently-used.xbel* rw,
|
||||
owner @{HOME}/.config/user-dirs.dirs r,
|
||||
owner @{HOME}/.config/mimeapps.list r,
|
||||
owner @{home_local_share}/applications/{**,} r,
|
||||
owner @{home_local_share}/icons/{**,} r,
|
||||
owner @{home_local_share}/mime/{**,} r,
|
||||
owner @{user_share_dirs}/applications/{**,} r,
|
||||
owner @{user_share_dirs}/icons/{**,} r,
|
||||
owner @{user_share_dirs}/mime/{**,} r,
|
||||
|
|
|
@ -1,6 +1,15 @@
|
|||
# This file defines variables for /usr/share, ~/.local/share and other
|
||||
# paths that should be treated in the same way as those.
|
||||
|
||||
@{flatpak_exports_root} = {flatpak/exports,flatpak/{app,runtime}/*/*/*/*/export}
|
||||
@{usr_share} = /{usr,usr/local,var/lib/@{flatpak_exports_root}}/share
|
||||
@{home_local_share} = @{HOME}/.local/{,share/@{flatpak_exports_root}}/share
|
||||
|
||||
# System-wide directories with behaviour analogous to /usr/share
|
||||
# in patterns like the freedesktop.org basedir spec. These are
|
||||
# owned by root or a system user, appear in XDG_DATA_DIRS, and
|
||||
# are the parent directory for `applications`, `themes`,
|
||||
# `dbus-1/services`, etc.
|
||||
@{system_share_dirs} = /{usr,usr/local,var/lib/@{flatpak_exports_root}}/share
|
||||
|
||||
# Per-user/personal directories with behaviour analogous to
|
||||
# ~/.local/share in patterns like the freedesktop.org basedir spec.
|
||||
# These are owned by the user running an application, appear in
|
||||
# XDG_DATA_DIRS or XDG_DATA_HOME, and are the parent directory
|
||||
# for the same subdirectories as @{system_share_dirs}
|
||||
@{user_share_dirs} = @{HOME}/.local/{,share/@{flatpak_exports_root}}/share
|
||||
|
|
Loading…
Add table
Reference in a new issue