Install executables to the right spots.

pull/1/head
Simon Quigley 3 years ago
parent 06e89e5442
commit 55c3f71582

@ -29,3 +29,7 @@ qt_add_executable(lubuntu-installer-prompt
target_link_libraries(lubuntu-installer-prompt PRIVATE Qt6::Widgets) target_link_libraries(lubuntu-installer-prompt PRIVATE Qt6::Widgets)
qt_finalize_executable(lubuntu-installer-prompt) 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)

@ -0,0 +1,3 @@
#!/bin/bash
pkexec calamares -D6

@ -10,7 +10,7 @@ InstallerPrompt::InstallerPrompt(QWidget *parent)
ui->setupUi(this); ui->setupUi(this);
// Set the background image and scale it // 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(); QScreen *screen = QGuiApplication::primaryScreen();
QRect screenGeometry = screen->geometry(); QRect screenGeometry = screen->geometry();
@ -45,7 +45,7 @@ void InstallerPrompt::tryLubuntu()
void InstallerPrompt::installLubuntu() void InstallerPrompt::installLubuntu()
{ {
QProcess *calamares = new QProcess(this); QProcess *calamares = new QProcess(this);
calamares->start("/usr/bin/pkexec /usr/bin/calamares"); calamares->start("/usr/bin/lubuntu-installer");
} }
InstallerPrompt::~InstallerPrompt() InstallerPrompt::~InstallerPrompt()

Loading…
Cancel
Save