Lubuntu/installer-prompt
10
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fix theming, fix freeze when Calamares quits without reboot

Browse Source
This commit is contained in:
Aaron Rainbolt 2023-12-14 22:05:30 -06:00
parent e05ca8280e
commit b372c48076
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -58,7 +58,6 @@ install(PROGRAMS "scripts/change-system-language" DESTINATION libexec)
install(PROGRAMS "scripts/lubuntu-installer" 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 bin)
install(FILES "lubuntu-live-environment.desktop" DESTINATION share/xsessions) 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) if(QT_VERSION_MAJOR EQUAL 6)
qt_finalize_executable(lubuntu-installer-prompt) qt_finalize_executable(lubuntu-installer-prompt)

2
scripts/lubuntu-installer
View File

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

6
scripts/start-lubuntu-live-env
View File

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
# Starts the Lubuntu Live Environment. # 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_CONFIG_DIRS="/etc/xdg/xdg-Lubuntu:"$XDG_CONFIG_DIRS
export XDG_DATA_DIRS="/usr/share/Lubuntu:"$XDG_DATA_DIRS export XDG_DATA_DIRS="/usr/share/Lubuntu:"$XDG_DATA_DIRS
export DESKTOP_SESSION="Lubuntu" export DESKTOP_SESSION="Lubuntu"
openbox &
sudo lubuntu-installer-prompt # This is intentionally *not* backgrounded.
# If it exits...
killall openbox killall openbox
startlxqt startlxqt

3
src/installerprompt.cpp
View File

@ -513,8 +513,7 @@ void InstallerPrompt::installLubuntu()
calamares->start("/usr/libexec/lubuntu-installer", args); 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). // If Calamares exits, it either crashed or the user cancelled the installation. Exit the installer prompt (and start LXQt).
connect(calamares, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), connect(calamares, SIGNAL(finished(int)), this, SLOT(tryLubuntu()));
this, [this](int, QProcess::ExitStatus){ this->tryLubuntu(); });
} }
InstallerPrompt::~InstallerPrompt() InstallerPrompt::~InstallerPrompt()