diff --git a/make-test.sh b/make-test.sh index beb13ad6cb..f9dc32968f 100755 --- a/make-test.sh +++ b/make-test.sh @@ -26,6 +26,20 @@ if [ $check_extracmakemodules -eq 0 ]; then echo "extra-cmake-modules installed" fi +check_base_devel=$(pacman -Q | grep -c base-devel) +if [ $check_base_devel -eq 0 ]; then + echo "base-devel not found... Installing" + sudo pacman -Sy base-devel --noconfirm + echo "base-devel installed" +fi + +check_make=$(pacman -Q | grep -c make) +if [ $check_make -eq 0 ]; then + echo "make not found... Installing" + sudo pacman -Sy make --noconfirm + echo "make installed" +fi + # Build mkdir -p build cd build @@ -41,8 +55,8 @@ cd .. # Install files sudo mkdir -p /usr/share/calamares/branding sudo cp -R ./src/branding/astroarch /usr/share/calamares/branding/ -sudo cp ./src/.astroarch/configs/49-nopasswd-calamares-vnc.rules /etc/polkit-1/rules.d/49-nopasswd-calamares-vnc.rules -sudo cp ./src/.astroarch/configs/49-nopasswd-calamares-xrdp.rules /etc/polkit-1/rules.d/49-nopasswd-calamares-xrdp.rules -sudo cp ./src/.astroarch/configs/com.github.calamares.calamares.policy /usr/share/polkit-1/actions/com.github.calamares.calamares.policy -cp ./src/.astroarch/configs/netinstall_software.yaml /home/astronaut/.astroarch/configs/netinstall_software.yaml -cp -r ./src/.astroarch/plugins/power_max_current /home/astronaut/.astroarch/plugins +sudo cp ./src/usr/share/astroarch_onboarding/configs/49-nopasswd-calamares-vnc.rules /etc/polkit-1/rules.d/49-nopasswd-calamares-vnc.rules +sudo cp ./src/usr/share/astroarch_onboarding/configs/49-nopasswd-calamares-xrdp.rules /etc/polkit-1/rules.d/49-nopasswd-calamares-xrdp.rules +sudo cp ./src/usr/share/astroarch_onboarding/configs/com.github.calamares.calamares.policy /usr/share/polkit-1/actions/com.github.calamares.calamares.policy +sudo cp -r ./src/usr/share/astroarch_onboarding /usr/share/ + diff --git a/removel_files_for_test.sh b/remove_files_test.sh similarity index 88% rename from removel_files_for_test.sh rename to remove_files_test.sh index 89f11ab746..2cf245015f 100755 --- a/removel_files_for_test.sh +++ b/remove_files_test.sh @@ -4,7 +4,7 @@ sudo rm /etc/polkit-1/rules.d/49-nopasswd-calamares-vnc.rules sudo rm /etc/polkit-1/rules.d/49-nopasswd-calamares-xrdp.rules sudo rm /usr/share/polkit-1/actions/com.github.calamares.calamares.policy -rm /home/astronaut/.astroarch/configs/netinstall_software.yaml +sudo rm /usr/share/astroarch_onboarding rm -rf /home/astronaut/.astroarch/plugins/power_max_current sudo rm -rf /usr/share/calamares sudo rm /usr/lib/calamares/libcalamares.so diff --git a/src/modules/contextualprocess/contextualprocess.conf b/src/modules/contextualprocess/contextualprocess.conf index 2e974d7b5b..ea0133fe1a 100644 --- a/src/modules/contextualprocess/contextualprocess.conf +++ b/src/modules/contextualprocess/contextualprocess.conf @@ -61,41 +61,70 @@ dontChroot: true # "2020.2": "/bin/false february" # "2019.4": "/bin/true april" #"packagechooser_packagechooserq": + + "packagechooser_kstars_indi": "kstars_indi_stable": - - command: "-/bin/zsh -i -c use-astro-stable" - timeout: 40 + - command: "/bin/sed -i 's/%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" + - command: "-/bin/su astronaut -c 'source /home/astronaut/.zshrc && use-astro-stable'" + timeout: 14400 + - command: "/bin/sed -i '0,/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/s/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers" "kstars_indi_bleeding_edge": - - command: "-/bin/zsh -i -c use-astro-bleeding-edge" - timeout: 40 + - command: "/bin/sed -i 's/%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" + - command: "-/bin/su astronaut -c 'source /home/astronaut/.zshrc && use-astro-bleeding-edge'" + timeout: 14400 + - command: "/bin/sed -i '0,/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/s/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers" + +"packagechooser_astromonitorToken": + "*": + - command: "/bin/sed -i 's/%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" + - command: "-/bin/su astronaut -c 'source /home/astronaut/.zshrc && /usr/share/astroarch_onboarding/configs/astromonitor.sh'" + timeout: 14400 + - command: "/bin/sed -i '0,/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/s/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers" + "packagechooser_power": "power_max_current": - - command: "-/bin/zsh -i -c power_max_current" - timeout: 40 + - command: "/bin/sed -i 's/%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" + - command: "-/bin/su astronaut -c 'source /home/astronaut/.zshrc && power_max_current'" + timeout: 14400 + - command: "/bin/sed -i '0,/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/s/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers" "power_standard": - timeout: 40 + timeout: 14400 "packagechooser_gps": "gps_on": - - command: "-/bin/zsh -i -c gps_on" - timeout: 40 + - command: "/bin/sed -i 's/%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" + - command: "-/bin/su astronaut -c 'source /home/astronaut/.zshrc && gps_on'" + timeout: 14400 + - command: "/bin/sed -i '0,/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/s/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers" "gps_off": - - command: "-/bin/zsh -i -c gps_off" - timeout: 40 + - command: "/bin/sed -i 's/%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" + - command: "-/bin/su astronaut -c 'source /home/astronaut/.zshrc && gps_off'" + timeout: 14400 + - command: "/bin/sed -i '0,/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/s/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers" "packagechooser_ftp": "ftp_on": - - command: "-/bin/zsh -i -c ftp_on" - timeout: 40 + - command: "/bin/sed -i 's/%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" + - command: "-/bin/su astronaut -c 'source /home/astronaut/.zshrc && ftp_on'" + timeout: 14400 + - command: "/bin/sed -i '0,/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/s/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers" "ftp_off": - - command: "-/bin/zsh -i -c ftp_off" - timeout: 40 + - command: "/bin/sed -i 's/%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" + - command: "-/bin/su astronaut -c 'source /home/astronaut/.zshrc && ftp_off'" + timeout: 14400 + - command: "/bin/sed -i '0,/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/s/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers" "packagechooser_bluetooth": "bluetooth_on": - - command: "-/bin/zsh -i -c bluetooth_on" - timeout: 40 + - command: "/bin/sed -i 's/%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" + - command: "-/bin/su astronaut -c 'source /home/astronaut/.zshrc && bluetooth_on'" + timeout: 14400 + - command: "/bin/sed -i '0,/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/s/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers" "bluetooth_off": - - command: "-/bin/zsh -i -c bluetooth_off" - timeout: 40 + - command: "/bin/sed -i 's/%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" + - command: "-/bin/su astronaut -c 'source /home/astronaut/.zshrc && bluetooth_off'" + timeout: 14400 + - command: "/bin/sed -i '0,/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/s/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers" + diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index 642311b33b..94d17fb73a 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -26,6 +26,9 @@ #include "utils/Logger.h" #include "utils/Variant.h" +#include +#include + /** @brief This removes any values from @p groups that match @p source * * This is used to remove duplicates from the netinstallAdd structure @@ -201,6 +204,7 @@ Config::updateGlobalStorage() const } if ( m_method == PackageChooserMethod::Legacy ) { + auto* gs = Calamares::JobQueue::instance()->globalStorage(); if ( m_packageChoice.has_value() ) { @@ -210,6 +214,36 @@ Config::updateGlobalStorage() const { gs->remove( make_gs_key( m_defaultId ) ); } + + const QString astromonitorKey = "packagechooser_astromonitorToken"; + + if ( m_astromonitorToken.has_value() ) + { + gs->insert( astromonitorKey, m_astromonitorToken.value() ); + + const QString tokenValue = m_astromonitorToken.value(); + const QString filePath = "/usr/share/astroarch_onboarding/configs/astromonitor_token.tmp"; // À AJUSTER + + QFile file(filePath); + if (file.open(QIODevice::WriteOnly | QIODevice::Text)) + { + QTextStream out(&file); + out << tokenValue; + file.close(); + cDebug() << "Successfully saved astromonitor token to" << filePath; + } + else + { + cWarning() << "Could not open file for writing:" << filePath; + } + + + } + else + { + gs->remove( astromonitorKey ); + } + } else if ( m_method == PackageChooserMethod::Packages ) { @@ -219,6 +253,21 @@ Config::updateGlobalStorage() const { cWarning() << "Unknown packagechooser method" << smash( m_method ); } + +} + +void +Config::setAstromonitorToken( const QString& astromonitorToken ) +{ + if ( astromonitorToken.isEmpty() ) + { + m_astromonitorToken.reset(); + } + else + { + m_astromonitorToken = astromonitorToken; + } + emit astromonitorTokenChanged( m_astromonitorToken.value_or( QString() ) ); } void diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h index f7a3165c84..b59f177893 100644 --- a/src/modules/packagechooser/Config.h +++ b/src/modules/packagechooser/Config.h @@ -55,6 +55,8 @@ class Config : public Calamares::ModuleSystem::Config Q_PROPERTY( QString packageChoice READ packageChoice WRITE setPackageChoice NOTIFY packageChoiceChanged ) Q_PROPERTY( QString prettyStatus READ prettyStatus NOTIFY prettyStatusChanged FINAL ) + Q_PROPERTY( QString astromonitorToken READ astromonitorToken WRITE setAstromonitorToken NOTIFY astromonitorTokenChanged ) + public: Config( QObject* parent = nullptr ); ~Config() override; @@ -101,10 +103,15 @@ class Config : public Calamares::ModuleSystem::Config QString prettyName() const; QString prettyStatus() const; + QString astromonitorToken() const { return m_astromonitorToken.value_or( QString() ); } + void setAstromonitorToken( const QString& astromonitorToken ); + signals: void packageChoiceChanged( QString packageChoice ); void prettyStatusChanged(); + void astromonitorTokenChanged( QString astromonitorToken ); + private: PackageListModel* m_model = nullptr; QModelIndex m_defaultModelIndex; @@ -121,6 +128,9 @@ class Config : public Calamares::ModuleSystem::Config * Reading the property will return an empty QString. */ std::optional< QString > m_packageChoice; + + std::optional< QString > m_astromonitorToken; + Calamares::Locale::TranslatedString* m_stepName; // As it appears in the sidebar }; diff --git a/src/modules/packagechooserq/ContextualProcessJob.h b/src/modules/packagechooserq/ContextualProcessJob.h new file mode 100644 index 0000000000..8d58a3cbe5 --- /dev/null +++ b/src/modules/packagechooserq/ContextualProcessJob.h @@ -0,0 +1,48 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef CONTEXTUALPROCESSJOB_H +#define CONTEXTUALPROCESSJOB_H + +#include +#include + +#include "CppJob.h" +#include "DllMacro.h" + +#include "utils/PluginFactory.h" + +class ContextualProcessBinding; + +class PLUGINDLLEXPORT ContextualProcessJob : public Calamares::CppJob +{ + Q_OBJECT + +public: + explicit ContextualProcessJob( QObject* parent = nullptr ); + ~ContextualProcessJob() override; + + QString prettyName() const override; + + Calamares::JobResult exec() override; + + void setConfigurationMap( const QVariantMap& configurationMap ) override; + + /// The number of bindings + int count(); + /// The number of value-checks for the named binding (-1 if binding doesn't exist) + int count( const QString& variableName ); + +private: + QList< ContextualProcessBinding* > m_commands; +}; + +CALAMARES_PLUGIN_FACTORY_DECLARATION( ContextualProcessJobFactory ) + +#endif // CONTEXTUALPROCESSJOB_H diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp index e780b5e3d2..3659e62804 100644 --- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp +++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp @@ -17,6 +17,9 @@ #include "utils/System.h" #include "utils/Variant.h" +#include "Job.h" +#include "ContextualProcessJob.h" + CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageChooserQmlViewStepFactory, registerPlugin< PackageChooserQmlViewStep >(); ) PackageChooserQmlViewStep::PackageChooserQmlViewStep( QObject* parent ) diff --git a/src/modules/packagechooserq/packagechooserq-qt6.qml b/src/modules/packagechooserq/packagechooserq-qt6.qml index aafe4f8396..f0df450ae1 100644 --- a/src/modules/packagechooserq/packagechooserq-qt6.qml +++ b/src/modules/packagechooserq/packagechooserq-qt6.qml @@ -14,6 +14,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts + Item { width: parent.width height: parent.height @@ -171,6 +172,38 @@ Item { wrapMode: Text.WordWrap } } + + Rectangle { + width: 700 + height: 50 + color: "#ffffff" + radius: 10 + border.width: 0 + + Text { + x: 10 + y: 15 + text: qsTr("Recovering your backup with Astro monitor:") + font.pointSize: 10 + } + + TextField { + id: astromonitorInputField + x: 290 + y: 10 + width: 390 + placeholderText: qsTr("Enter your astromonitor token here") + color: "black" + background: Rectangle { + color: "#f2f2f2" + } + placeholderTextColor: "darkgray" + + onTextChanged: { + config.astromonitorToken = astromonitorInputField.text + } + } + } } } diff --git a/src/modules/packages/packages.conf b/src/modules/packages/packages.conf index f09138b0ab..76d777a2ed 100644 --- a/src/modules/packages/packages.conf +++ b/src/modules/packages/packages.conf @@ -77,7 +77,7 @@ update_system: false # when set to true. If missing, false is assumed. pacman: num_retries: 0 - disable_download_timeout: false + disable_download_timeout: true needed_only: false # @@ -202,9 +202,9 @@ pacman: # "binutils", and then a second time for "wget". When installing large numbers # of packages, this can lead to a considerable time savings. # -#operations: -# - install: -# - vi +operations: + - install: + - base-devel # - vi-${LOCALE} # - wget # - binutils diff --git a/src/modules/shellprocess/shellprocess-final.conf b/src/modules/shellprocess/shellprocess-final.conf index 9c19d1119a..af59f4eadb 100644 --- a/src/modules/shellprocess/shellprocess-final.conf +++ b/src/modules/shellprocess/shellprocess-final.conf @@ -77,6 +77,7 @@ script: - "-/bin/rm -f /home/astronaut/.config/plasma-localerc" - "-/bin/rm -f /home/astronaut/.config/autostart/AstroArch-onboarding-x11.desktop" - "-/bin/rm -f /home/astronaut/.config/autostart/AstroArch-onboarding-xrdp.desktop" + - "/bin/rm /etc/sudoers.d/sudoers_onboarding" # - "-/bin/sed -i 's/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/# %wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" # - "-/bin/sed -i 's/# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/g' /etc/sudoers" diff --git a/src/modules/shellprocess/shellprocess-update.conf b/src/modules/shellprocess/shellprocess-update.conf index 3459eb4f4a..784d896c8a 100644 --- a/src/modules/shellprocess/shellprocess-update.conf +++ b/src/modules/shellprocess/shellprocess-update.conf @@ -74,8 +74,11 @@ dontChroot: true # ignored; the slowloris command has a different timeout from the # other commands in the list): script: - - command: "/bin/zsh -i -c update-astroarch" - timeout: 300 + - "/bin/cp /usr/share/astroarch_onboarding/configs/sudoers_onboarding /etc/sudoers.d/sudoers_onboarding" + - command: "/bin/sed -i 's/%wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' /etc/sudoers" + - command: "-/bin/su astronaut -c 'source /home/astronaut/.zshrc && update-astroarch'" + - command: "/bin/sed -i '0,/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/s/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers" + timeout: 14400 # You can change the description of the job (as it is displayed in the # progress bar during installation) by defining an *i18n* key, which @@ -91,4 +94,4 @@ script: i18n: name: "Update AstroArch" -timeout: 999 +timeout: 14400 diff --git a/src/usr/share/astroarch_onboarding/configs/astromonitor.sh b/src/usr/share/astroarch_onboarding/configs/astromonitor.sh new file mode 100755 index 0000000000..7f0b6ba26b --- /dev/null +++ b/src/usr/share/astroarch_onboarding/configs/astromonitor.sh @@ -0,0 +1,21 @@ +#!/bin/zsh + +TOKEN_FILE="/usr/share/astroarch_onboarding/configs/astromonitor_token.tmp" +JETON="" + +if [ -f "$TOKEN_FILE" ]; then + JETON=$(cat "$TOKEN_FILE") +fi + +if [[ -n "$JETON" ]]; then + + cd /home/astronaut + astromonitor --retrieve-backup ${JETON} + EXIT_CODE=$? + + if [[ $EXIT_CODE -ne 0 ]]; then + notify-send --app-name 'AstroArch' --icon="/home/astronaut/.astroarch/assets/icons/novnc-icon.svg" -t 10000 'Astro Monitor' "❌ Astro Monitor was unable to import your Kstars backup" + else + notify-send --app-name 'AstroArch' --icon="/home/astronaut/.astroarch/assets/icons/novnc-icon.svg" -t 10000 'Astro Monitor' "✅ Astro Monitor has successfully imported your Kstars backup" + fi +fi diff --git a/src/usr/share/astroarch_onboarding/configs/netinstall_software.yaml b/src/usr/share/astroarch_onboarding/configs/netinstall_software.yaml index 7094101e82..4ae7a4da41 100644 --- a/src/usr/share/astroarch_onboarding/configs/netinstall_software.yaml +++ b/src/usr/share/astroarch_onboarding/configs/netinstall_software.yaml @@ -37,3 +37,33 @@ selected: false packages: - rustdesk + - name: "Gwenview" + description: "A fast and easy to use image viewer" + selected: false + packages: + - gwenview + - name: "Htop" + description: "Interactive process viewer" + selected: false + packages: + - htop + - name: "Glances" + description: "CLI curses-based monitoring tool" + selected: false + packages: + - glances + - name: "Filelight" + description: "View disk usage information" + selected: false + packages: + - filelight + - name: "Syncthing" + description: "Open Source Continuous Replication / Cluster Synchronization Thing" + selected: false + packages: + - syncthing + - name: "Kinfocenter" + description: "A utility that provides information about a computer system" + selected: false + packages: + - kinfocenter diff --git a/src/usr/share/astroarch_onboarding/configs/sudoers_onboarding b/src/usr/share/astroarch_onboarding/configs/sudoers_onboarding new file mode 100644 index 0000000000..edcb50c8ed --- /dev/null +++ b/src/usr/share/astroarch_onboarding/configs/sudoers_onboarding @@ -0,0 +1,3 @@ +Defaults passwd_timeout=0 +Defaults timestamp_type=global +Defaults timestamp_timeout=240 diff --git a/src/usr/share/astroarch_onboarding/desktop/AstroArch-onboarding-x11.desktop b/src/usr/share/astroarch_onboarding/desktop/AstroArch-onboarding-x11.desktop index 1b8f118d25..82cfcbb24d 100755 --- a/src/usr/share/astroarch_onboarding/desktop/AstroArch-onboarding-x11.desktop +++ b/src/usr/share/astroarch_onboarding/desktop/AstroArch-onboarding-x11.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Qt;System; Comment=AstroArch — System Configuration -Exec=sh -c 'xhost +si:localuser:root && pkexec env HOME=/home/astronaut XDG_CURRENT_DESKTOP=KDE XDG_SESSION_TYPE=x11 XDG_SESSION_CLASS=user XDG_SESSION_ID=1 DISPLAY=:0 calamares' +Exec=sh -c 'xhost +si:localuser:root && pkexec env HOME=/home/astronaut XDG_CURRENT_DESKTOP=KDE XDG_SESSION_TYPE=x11 XDG_SESSION_CLASS=user XDG_SESSION_ID=1 DISPLAY=:0 DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus calamares' GenericName=AstroArch onboarding Icon=/home/astronaut/.astroarch/assets/icons/novnc-96x96.png Keywords=calamares;system;installer; diff --git a/src/usr/share/astroarch_onboarding/desktop/AstroArch-onboarding-xrdp.desktop b/src/usr/share/astroarch_onboarding/desktop/AstroArch-onboarding-xrdp.desktop index c84261e261..b3eaa9a32d 100755 --- a/src/usr/share/astroarch_onboarding/desktop/AstroArch-onboarding-xrdp.desktop +++ b/src/usr/share/astroarch_onboarding/desktop/AstroArch-onboarding-xrdp.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Qt;System; Comment=AstroArch — System Configuration -Exec=sh -c 'xhost +si:localuser:root && pkexec env HOME=/home/astronaut XDG_CURRENT_DESKTOP=KDE XDG_SESSION_TYPE=x11 XDG_SESSION_CLASS=user XDG_SESSION_ID=3 DISPLAY=:10 calamares' +Exec=sh -c 'xhost +si:localuser:root && pkexec env $(printenv) HOME=/home/astronaut XDG_CURRENT_DESKTOP=KDE XDG_SESSION_TYPE=x11 XDG_SESSION_CLASS=user XDG_SESSION_ID=3 DISPLAY=:10 calamares' GenericName=AstroArch onboarding Icon=/home/astronaut/.astroarch/assets/icons/novnc-96x96.png Keywords=calamares;system;installer;