Fix xdg user dirs (#186)

* Rename XDG_*_HOME to XDG_*_DIR for consistent naming

* tunables/xdg-user-dirs.d/apparmor.d now includes 'apparmor.d.d' subfolder to permit user override
This commit is contained in:
ShellCode 2023-08-17 18:28:10 +00:00 committed by GitHub
parent e821470d0d
commit cc8210a1bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 28 deletions

View file

@ -31,19 +31,19 @@
@{XDG_PASSWORD_STORE_DIR}=".password-store"
# Definition of local user configuration directories
@{XDG_CACHE_HOME}=".cache"
@{XDG_CONFIG_HOME}=".config"
@{XDG_DATA_HOME}=".local/share"
@{XDG_STATE_HOME}=".local/state"
@{XDG_BIN_HOME}=".local/bin"
@{XDG_LIB_HOME}=".local/lib"
@{XDG_CACHE_DIR}=".cache"
@{XDG_CONFIG_DIR}=".config"
@{XDG_DATA_DIR}=".local/share"
@{XDG_STATE_DIR}=".local/state"
@{XDG_BIN_DIR}=".local/bin"
@{XDG_LIB_DIR}=".local/lib"
# Full path of the user configuration directories
@{user_cache_dirs}=@{HOME}/@{XDG_CACHE_HOME}
@{user_config_dirs}=@{HOME}/@{XDG_CONFIG_HOME}
@{user_state_dirs}=@{HOME}/@{XDG_STATE_HOME}
@{user_bin_dirs}=@{HOME}/@{XDG_BIN_HOME}
@{user_lib_dirs}=@{HOME}/@{XDG_LIB_HOME}
@{user_cache_dirs}=@{HOME}/@{XDG_CACHE_DIR}
@{user_config_dirs}=@{HOME}/@{XDG_CONFIG_DIR}
@{user_state_dirs}=@{HOME}/@{XDG_STATE_DIR}
@{user_bin_dirs}=@{HOME}/@{XDG_BIN_DIR}
@{user_lib_dirs}=@{HOME}/@{XDG_LIB_DIR}
# User build directories and output
@{user_build_dirs}="/tmp/"

View file

@ -20,3 +20,5 @@
@{user_templates_dirs}=@{HOME}/@{XDG_TEMPLATES_DIR} @{MOUNTS}/@{XDG_TEMPLATES_DIR}
@{user_videos_dirs}=@{HOME}/@{XDG_VIDEOS_DIR} @{MOUNTS}/@{XDG_VIDEOS_DIR}
@{user_vm_shares}=@{HOME}/@{XDG_VM_SHARES_DIR} @{MOUNTS}/@{XDG_VM_SHARES_DIR}
include if exists <tunnables/xdg-user-dirs.d/apparmor.d.d>