From d25b3c1f2fb25696efeae4a99023544755722a52 Mon Sep 17 00:00:00 2001
From: Simon Quigley <simon@tsimonq2.net>
Date: Sat, 23 Dec 2023 16:07:37 -0600
Subject: [PATCH] Touch up the live session scripts, so it's actually started
 with our theming.

---
 CMakeLists.txt                   | 2 +-
 lubuntu-live-environment.desktop | 2 +-
 scripts/start-lubuntu-live-env   | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15c9f0d..bd8db87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ install(TARGETS lubuntu-installer-prompt
 )
 install(PROGRAMS "scripts/change-system-language" DESTINATION libexec)
 install(PROGRAMS "scripts/lubuntu-installer" DESTINATION libexec)
-install(PROGRAMS "scripts/start-lubuntu-live-env" DESTINATION bin)
+install(PROGRAMS "scripts/start-lubuntu-live-env" DESTINATION libexec)
 install(FILES "lubuntu-live-environment.desktop" DESTINATION share/xsessions)
 
 if(QT_VERSION_MAJOR EQUAL 6)
diff --git a/lubuntu-live-environment.desktop b/lubuntu-live-environment.desktop
index 18b2d89..910b9e9 100644
--- a/lubuntu-live-environment.desktop
+++ b/lubuntu-live-environment.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/usr/bin/start-lubuntu-live-env
+Exec=/usr/libexec/start-lubuntu-live-env
 Name=Lubuntu Live Environment
 Comment=Starts the Lubuntu Live Environment
 Type=Application
diff --git a/scripts/start-lubuntu-live-env b/scripts/start-lubuntu-live-env
index 5e714d4..912189f 100755
--- a/scripts/start-lubuntu-live-env
+++ b/scripts/start-lubuntu-live-env
@@ -1,11 +1,17 @@
 #!/bin/bash
 # Starts the Lubuntu Live Environment.
 
+# This is pretty overkill, but don't remove anything without testing
 export XDG_CONFIG_DIRS="/etc/xdg/xdg-Lubuntu:"$XDG_CONFIG_DIRS
 export XDG_DATA_DIRS="/usr/share/Lubuntu:"$XDG_DATA_DIRS
+export XDG_SESSION_CLASS="user"
+export XDG_SESSION_DESKTOP="Lubuntu"
 export DESKTOP_SESSION="Lubuntu"
+export QT_STYLE_OVERRIDE="Breeze"
+export QT_QPA_PLATFORMTHEME="lxqt"
+
 openbox &
-sudo lubuntu-installer-prompt # This is intentionally *not* backgrounded.
+sudo -E lubuntu-installer-prompt # This is intentionally *not* backgrounded.
 # If it exits...
 killall openbox
 startlxqt