From 55c3f71582f86f1dbc9446629671c51ff80d05dc Mon Sep 17 00:00:00 2001
From: Simon Quigley <simon@tsimonq2.net>
Date: Thu, 30 Jun 2022 14:54:28 -0500
Subject: [PATCH] Install executables to the right spots.

---
 CMakeLists.txt            | 4 ++++
 scripts/lubuntu-installer | 3 +++
 src/installerprompt.cpp   | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100755 scripts/lubuntu-installer

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7492fe5..3fc2e01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,3 +29,7 @@ qt_add_executable(lubuntu-installer-prompt
 target_link_libraries(lubuntu-installer-prompt PRIVATE Qt6::Widgets)
 
 qt_finalize_executable(lubuntu-installer-prompt)
+
+install(TARGETS lubuntu-installer-prompt DESTINATION bin)
+install(PROGRAMS "scripts/lubuntu-installer" DESTINATION bin)
+install(FILES "img/background.png" DESTINATION share/lubuntu/installer-prompt)
diff --git a/scripts/lubuntu-installer b/scripts/lubuntu-installer
new file mode 100755
index 0000000..e5095f3
--- /dev/null
+++ b/scripts/lubuntu-installer
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+pkexec calamares -D6
diff --git a/src/installerprompt.cpp b/src/installerprompt.cpp
index 811da22..9f23d6c 100644
--- a/src/installerprompt.cpp
+++ b/src/installerprompt.cpp
@@ -10,7 +10,7 @@ InstallerPrompt::InstallerPrompt(QWidget *parent)
     ui->setupUi(this);
 
     // Set the background image and scale it
-    QPixmap bg("../img/background.png");
+    QPixmap bg("/usr/share/lubuntu/installer-prompt/background.png");
     QScreen *screen = QGuiApplication::primaryScreen();
     QRect screenGeometry = screen->geometry();
 
@@ -45,7 +45,7 @@ void InstallerPrompt::tryLubuntu()
 void InstallerPrompt::installLubuntu()
 {
     QProcess *calamares = new QProcess(this);
-    calamares->start("/usr/bin/pkexec /usr/bin/calamares");
+    calamares->start("/usr/bin/lubuntu-installer");
 }
 
 InstallerPrompt::~InstallerPrompt()