[neon/snap-packaging/plasma-desktop-session-snap] scripts: Remove unused files

Kevin Ottens null at kde.org
Fri May 3 17:33:55 BST 2024


Git commit 64afda0904a3cdbd1b2c9c86922c39fa481bcee3 by Kevin Ottens.
Committed on 02/05/2024 at 14:26.
Pushed by ervin into branch 'master'.

Remove unused files

D  +0    -83   scripts/session-wrapper.sh
D  +0    -8    scripts/ubuntu-desktop-session.desktop

https://invent.kde.org/neon/snap-packaging/plasma-desktop-session-snap/-/commit/64afda0904a3cdbd1b2c9c86922c39fa481bcee3

diff --git a/scripts/session-wrapper.sh b/scripts/session-wrapper.sh
deleted file mode 100755
index e0e4b64..0000000
--- a/scripts/session-wrapper.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-
-# This script runs outside of snap confinement as a wrapper around the
-# confined desktop session.
-
-# Set up PATH and XDG_DATA_DIRS to allow calling snaps
-if [ -f /snap/snapd/current/etc/profile.d/apps-bin-path.sh ]; then
-    source /snap/snapd/current/etc/profile.d/apps-bin-path.sh
-fi
-
-export XDG_CURRENT_DESKTOP=ubuntu:GNOME
-export GSETTINGS_BACKEND=keyfile
-
-dbus-update-activation-environment --systemd --all
-
-# Don't set this in our own environment, since it will make
-# gnome-session believe it is running in X mode
-dbus-update-activation-environment --systemd DISPLAY=:0 WAYLAND_DISPLAY=wayland-0
-
-# Set up a background task to wait for gnome-session to create its
-# Xauthority file, and copy it to a location snaps will be able to
-# see.
-function fixup_xauthority() {
-    while :; do
-        sleep 1s
-        xauth_file="$(ls -1t /run/user/$(id -u)/snap.ubuntu-desktop-session/.mutter-Xwaylandauth.* | head -n1)"
-        if [ -f "$xauth_file" ]; then
-            cp "$xauth_file" /run/user/$(id -u)/.Xauthority
-            return
-        fi
-    done
-}
-fixup_xauthority &
-
-# Wait in background to link Wayland socket to location where other
-# snaps will look for it.
-function link_wayland_socket() {
-    private_socket=/run/user/$(id -u)/snap.ubuntu-desktop-session/wayland-0
-    public_socket=/run/user/$(id -u)/wayland-0
-    while :; do
-        sleep 1s
-        if [ -S "$private_socket" ]; then
-            ln -f "$private_socket" "$public_socket"
-            return
-        fi
-    done
-}
-link_wayland_socket &
-
-# Wait in background to link Pulseaudio socket to location where other
-# snaps will look for it.
-function link_pulse_socket() {
-    private_socket=/run/user/$(id -u)/snap.ubuntu-desktop-session/pulse
-    public_socket=/run/user/$(id -u)/pulse
-    mkdir -p $public_socket
-    while :; do
-        sleep 1s
-        if [ -S "${private_socket}/native" ]; then
-            ln -f "${private_socket}/native" "${public_socket}/native"
-            ln -f "${private_socket}/pid" "${public_socket}/pid"
-            return
-        fi
-    done
-}
-link_pulse_socket &
-
-# Wait in background to link Pipewire socket to location where other
-# snaps will look for it.
-function link_pipewire_socket() {
-    private_socket=/run/user/$(id -u)/snap.ubuntu-desktop-session/pipewire-0
-    public_socket=/run/user/$(id -u)/pipewire-0
-    while :; do
-        sleep 1s
-        if [ -S "${private_socket}" ]; then
-            ln -f "${private_socket}" "${public_socket}"
-            ln -f "${private_socket}.lock" "${public_socket}.lock"
-            return
-        fi
-    done
-}
-link_pipewire_socket &
-
-exec /snap/bin/ubuntu-desktop-session
diff --git a/scripts/ubuntu-desktop-session.desktop b/scripts/ubuntu-desktop-session.desktop
deleted file mode 100644
index 8c6b838..0000000
--- a/scripts/ubuntu-desktop-session.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Ubuntu (confined)
-Comment=This session logs you into Ubuntu
-Exec=/snap/ubuntu-desktop-session/current/session-wrapper.sh
-TryExec=/snap/ubuntu-desktop-session/current/session-wrapper.sh
-Type=Application
-DesktopNames=ubuntu:GNOME
-X-GDM-SessionRegisters=true



More information about the Neon-commits mailing list