Merge remote-tracking branch 'refs/remotes/origin/main'

This commit is contained in:
Anthony Rose 2022-12-12 13:26:15 +00:00
commit a2c8ee6061
2 changed files with 9 additions and 0 deletions

View file

@ -22,6 +22,7 @@
vars: vars:
packages: packages:
- apt-file - apt-file
- apt-listchanges
- curl - curl
- dc - dc
- dnsutils - dnsutils
@ -36,6 +37,7 @@
- sqlite3 - sqlite3
- sudo - sudo
- tmux - tmux
- unattended-upgrades
- vim - vim
- zstd - zstd
- name: Enable automatic update check - name: Enable automatic update check

View file

@ -57,6 +57,13 @@ then
XDG_DATA_DIRS="${XDG_DATA_DIRS}:${_snap_xdg_path}" XDG_DATA_DIRS="${XDG_DATA_DIRS}:${_snap_xdg_path}"
fi fi
unset _snap_xdg_path unset _snap_xdg_path
# Same as above for Flatpak.
_flatpak_xdg_path="$XDG_DATA_HOME/flatpak/exports/share"
if [ -x /usr/bin/flatpak ] && [ -n "${XDG_DATA_DIRS##*${_flatpak_xdg_path}}" ] && [ -n "${XDG_DATA_DIRS##*${_flatpak_xdg_path}:*}" ]
then
XDG_DATA_DIRS="${XDG_DATA_DIRS}:${_flatpak_xdg_path}"
fi
unset _flatpak_xdg_path
# Bash-specific settings that will not work in other Bourne-compatible shells. # Bash-specific settings that will not work in other Bourne-compatible shells.
if [ -n "$BASH_VERSION" ] if [ -n "$BASH_VERSION" ]