diff --git a/CMakeLists.txt b/CMakeLists.txt index 3848c15..15c9f0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,6 @@ 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(FILES "lubuntu-live-environment.desktop" DESTINATION share/xsessions) -install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink /etc/xdg/xdg-Lubuntu /etc/xdg/xdg-lubuntu-live-environment)") if(QT_VERSION_MAJOR EQUAL 6) qt_finalize_executable(lubuntu-installer-prompt) diff --git a/scripts/lubuntu-installer b/scripts/lubuntu-installer index e5095f3..13ac5b1 100755 --- a/scripts/lubuntu-installer +++ b/scripts/lubuntu-installer @@ -1,3 +1,3 @@ #!/bin/bash -pkexec calamares -D6 +sudo -E calamares -D6 diff --git a/scripts/start-lubuntu-live-env b/scripts/start-lubuntu-live-env index bc77890..5e714d4 100755 --- a/scripts/start-lubuntu-live-env +++ b/scripts/start-lubuntu-live-env @@ -1,11 +1,11 @@ #!/bin/bash # Starts the Lubuntu Live Environment. -openbox & -sudo lubuntu-installer-prompt # This is intentionally *not* backgrounded. -# If it exits... export XDG_CONFIG_DIRS="/etc/xdg/xdg-Lubuntu:"$XDG_CONFIG_DIRS export XDG_DATA_DIRS="/usr/share/Lubuntu:"$XDG_DATA_DIRS export DESKTOP_SESSION="Lubuntu" +openbox & +sudo lubuntu-installer-prompt # This is intentionally *not* backgrounded. +# If it exits... killall openbox startlxqt diff --git a/src/installerprompt.cpp b/src/installerprompt.cpp index 7a9ae9f..e9df82c 100644 --- a/src/installerprompt.cpp +++ b/src/installerprompt.cpp @@ -513,8 +513,7 @@ void InstallerPrompt::installLubuntu() calamares->start("/usr/libexec/lubuntu-installer", args); // If Calamares exits, it either crashed or the user cancelled the installation. Exit the installer prompt (and start LXQt). - connect(calamares, static_cast(&QProcess::finished), - this, [this](int, QProcess::ExitStatus){ this->tryLubuntu(); }); + connect(calamares, SIGNAL(finished(int)), this, SLOT(tryLubuntu())); } InstallerPrompt::~InstallerPrompt()