committing changes in /etc made by "apt-get remove --purge flatpak"

Package changes:
-flatpak 1.6.5-0ubuntu0.1 amd64

diff --git a/.etckeeper b/.etckeeper
index 96eb475c790617bcb20b7bb38596615aef34e7c6..ef60aa2249041cfa8e4fe66535cead695f445b01 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -219,7 +219,6 @@ maybe chmod 0755 'X11/Xsession'
 maybe chmod 0755 'X11/Xsession.d'
 maybe chmod 0644 'X11/Xsession.d/01gtk3-nocsd'
 maybe chmod 0644 'X11/Xsession.d/20dbus_xdg-runtime'
-maybe chmod 0644 'X11/Xsession.d/20flatpak'
 maybe chmod 0644 'X11/Xsession.d/20x11-common_process-args'
 maybe chmod 0644 'X11/Xsession.d/30x11-common_xresources'
 maybe chmod 0644 'X11/Xsession.d/35x11-common_xhost-local'
@@ -2922,7 +2921,6 @@ maybe chmod 0644 'profile.d/appmenu-qt5.sh'
 maybe chmod 0644 'profile.d/apps-bin-path.sh'
 maybe chmod 0644 'profile.d/bash_completion.sh'
 maybe chmod 0644 'profile.d/cedilla-portuguese.sh'
-maybe chmod 0644 'profile.d/flatpak.sh'
 maybe chmod 0644 'profile.d/gawk.csh'
 maybe chmod 0644 'profile.d/gawk.sh'
 maybe chmod 0644 'profile.d/im-config_wayland.sh'

diff --git a/X11/Xsession.d/20flatpak b/X11/Xsession.d/20flatpak
deleted file mode 100644 (file)
index 6c6e113..0000000
--- a/X11/Xsession.d/20flatpak
+++ /dev/null
@@ -1,26 +0,0 @@
-if command -v flatpak > /dev/null; then
-    # set XDG_DATA_DIRS to include Flatpak installations
-
-    new_dirs=$(
-        (
-            unset G_MESSAGES_DEBUG
-            echo "${XDG_DATA_HOME:-"$HOME/.local/share"}/flatpak"
-            flatpak --installations
-        ) | (
-            new_dirs=
-            while read -r install_path
-            do
-                share_path=$install_path/exports/share
-                case ":$XDG_DATA_DIRS:" in
-                    (*":$share_path:"*) :;;
-                    (*":$share_path/:"*) :;;
-                    (*) new_dirs=${new_dirs:+${new_dirs}:}$share_path;;
-                esac
-            done
-            echo "$new_dirs"
-        )
-    )
-
-    export XDG_DATA_DIRS
-    XDG_DATA_DIRS="${new_dirs:+${new_dirs}:}${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
-fi

diff --git a/profile.d/flatpak.sh b/profile.d/flatpak.sh
deleted file mode 100644 (file)
index 6c6e113..0000000
--- a/profile.d/flatpak.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-if command -v flatpak > /dev/null; then
-    # set XDG_DATA_DIRS to include Flatpak installations
-
-    new_dirs=$(
-        (
-            unset G_MESSAGES_DEBUG
-            echo "${XDG_DATA_HOME:-"$HOME/.local/share"}/flatpak"
-            flatpak --installations
-        ) | (
-            new_dirs=
-            while read -r install_path
-            do
-                share_path=$install_path/exports/share
-                case ":$XDG_DATA_DIRS:" in
-                    (*":$share_path:"*) :;;
-                    (*":$share_path/:"*) :;;
-                    (*) new_dirs=${new_dirs:+${new_dirs}:}$share_path;;
-                esac
-            done
-            echo "$new_dirs"
-        )
-    )
-
-    export XDG_DATA_DIRS
-    XDG_DATA_DIRS="${new_dirs:+${new_dirs}:}${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
-fi