Update for all version of AstroArch

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/
+

removel_files_for_test.sh → 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

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"
+                - 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: 40
+                - 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"
+                - 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: 40
+                - 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: 40
+                - 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"
+                - 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: 40
+                - 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
 
 "packagechooser_gps":
         "gps_on":
-                - command: "-/bin/zsh -i -c gps_on"
+                - 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: 40
+                - 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"
+                - 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: 40
+                - 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"
+                - 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: 40
+                - 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"
+                - 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: 40
+                - 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"
+                - 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: 40
+                - 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"
+                - 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: 40
+                - 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"
+

src/modules/packagechooser/Config.cpp

@@ -26,6 +26,9 @@
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
+#include <QFile>
+#include <QTextStream>
+
 /** @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

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
 };
 

src/modules/packagechooserq/ContextualProcessJob.h

@@ -0,0 +1,48 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#ifndef CONTEXTUALPROCESSJOB_H
+#define CONTEXTUALPROCESSJOB_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#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

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 )

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
+                    }
+                }
+            }
         }
     }
 

src/modules/packages/packages.conf

@@ -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

src/modules/shellprocess/shellprocess-update.conf

@@ -74,8 +74,10 @@ 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
+    - 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: 7200
 
 # 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 +93,4 @@ script:
 i18n:
      name: "Update AstroArch"
 
-timeout: 999
+timeout: 9999

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