From 9f9f7118ebdd7344920ef6ce01dccf1f78be6360 Mon Sep 17 00:00:00 2001
From: Aaron Rainbolt <arraybolt3@ubuntu.com>
Date: Mon, 6 Feb 2023 16:22:55 -0600
Subject: [PATCH] Change the desktop file to an X session and add supporting
 files.

---
 CMakeLists.txt                   | 3 ++-
 lubuntu-installer-prompt.desktop | 6 ------
 lubuntu-live-environment.desktop | 5 +++++
 scripts/start-lubuntu-live-env   | 8 ++++++++
 4 files changed, 15 insertions(+), 7 deletions(-)
 delete mode 100644 lubuntu-installer-prompt.desktop
 create mode 100644 lubuntu-live-environment.desktop
 create mode 100755 scripts/start-lubuntu-live-env

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af12c7b..0f5675a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,5 +32,6 @@ qt_finalize_executable(lubuntu-installer-prompt)
 
 install(TARGETS lubuntu-installer-prompt DESTINATION bin)
 install(PROGRAMS "scripts/lubuntu-installer" DESTINATION libexec)
+install(PROGRAMS "scripts/start-lubuntu-live-env" DESTINATION bin)
 install(FILES "img/background.png" DESTINATION share/lubuntu/installer-prompt)
-install(FILES "lubuntu-installer-prompt.desktop" DESTINATION /etc/xdg/xdg-Lubuntu/autostart)
+install(FILES "lubuntu-live-environment.desktop" DESTINATION share/xsessions)
diff --git a/lubuntu-installer-prompt.desktop b/lubuntu-installer-prompt.desktop
deleted file mode 100644
index eee958e..0000000
--- a/lubuntu-installer-prompt.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Exec=/usr/bin/lubuntu-installer-prompt
-Name=Lubuntu Installer Prompt
-Type=Application
-Version=0.3.0
-X-LXQt-Need-Tray=true
diff --git a/lubuntu-live-environment.desktop b/lubuntu-live-environment.desktop
new file mode 100644
index 0000000..c71f71a
--- /dev/null
+++ b/lubuntu-live-environment.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Exec=/bin/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
new file mode 100755
index 0000000..2ac3240
--- /dev/null
+++ b/scripts/start-lubuntu-live-env
@@ -0,0 +1,8 @@
+#!/bin/bash
+# Starts the Lubuntu Live Environment.
+
+openbox &
+lubuntu-installer-prompt # This is intentionally *not* backgrounded.
+# If it exits...
+killall openbox
+startlxqt