diff options
Diffstat (limited to 'src/modules/pacstrap-gui/pacstrap-gui.cpp')
| -rw-r--r-- | src/modules/pacstrap-gui/pacstrap-gui.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/modules/pacstrap-gui/pacstrap-gui.cpp b/src/modules/pacstrap-gui/pacstrap-gui.cpp index b405bb9b1..233e5896d 100644 --- a/src/modules/pacstrap-gui/pacstrap-gui.cpp +++ b/src/modules/pacstrap-gui/pacstrap-gui.cpp @@ -22,12 +22,6 @@ #include "pacstrap-gui.h" -/* PacstrapGuiJob private class constants */ - -const QString PacstrapGuiJob::WALLPAPER_FMT = "cp /etc/wallpaper.png %1/etc/" ; -const QString PacstrapGuiJob::WALLPAPER_ERROR_MSG = "The wallpaper installation command has failed." ; - - /* PacstrapGuiJob public instance methods */ PacstrapGuiJob::PacstrapGuiJob(QObject* parent) : PacstrapCppJob(tr(GUI_JOB_NAME) , @@ -40,18 +34,18 @@ PacstrapGuiJob::PacstrapGuiJob(QObject* parent) : PacstrapCppJob(tr(GUI_JOB_NAME QString PacstrapGuiJob::getPackageList() { -globalStorage->insert(DESKTOP_PACKAGES_KEY , MATE_PACKAGES_KEY) ; // TODO: per user option via globalStorage -printf("[PACSTRAP-GUI]: DesktopCppJob::getPackageList() default_desktop=%s" , globalStorage->value(DESKTOP_PACKAGES_KEY).toString().toStdString().c_str()) ; - - QString desktop = this->globalStorage->value(DESKTOP_PACKAGES_KEY).toString() ; - - return QListToString(this->localStorage.value(APPLICATIONS_PACKAGES_KEY).toList() + - this->localStorage.value(MULTIMEDIA_PACKAGES_KEY ).toList() + - this->localStorage.value(NETWORK_PACKAGES_KEY ).toList() + - this->localStorage.value(THEMES_PACKAGES_KEY ).toList() + - this->localStorage.value(UTILITIES_PACKAGES_KEY ).toList() + - this->localStorage.value(XSERVER_PACKAGES_KEY ).toList() + - this->localStorage.value(desktop ).toList() ) ; +globalStorage->insert(GS::DESKTOP_PACKAGES_KEY , MATE_PACKAGES_KEY) ; // TODO: per user option via globalStorage +DEBUG_TRACE_DESKTOPPACKAGES + + QString desktop = this->globalStorage->value(GS::DESKTOP_PACKAGES_KEY).toString() ; + + return (this->localStorage.value(APPLICATIONS_PACKAGES_KEY).toStringList() + + this->localStorage.value(MULTIMEDIA_PACKAGES_KEY ).toStringList() + + this->localStorage.value(NETWORK_PACKAGES_KEY ).toStringList() + + this->localStorage.value(THEMES_PACKAGES_KEY ).toStringList() + + this->localStorage.value(UTILITIES_PACKAGES_KEY ).toStringList() + + this->localStorage.value(XSERVER_PACKAGES_KEY ).toStringList() + + this->localStorage.value(desktop ).toStringList() ).join(' ') ; } @@ -62,14 +56,14 @@ QString PacstrapGuiJob::chrootExec() QString pacstrap_cmd = PACSTRAP_FMT .arg(this->confFile , MOUNTPOINT , packages) ; QString wallpaper_cmd = WALLPAPER_FMT.arg(MOUNTPOINT) ; - if (!!ExecWithStatus(pacstrap_cmd)) return PACSTRAP_ERROR_MSG ; + if (!!execStatus(pacstrap_cmd , CHROOT_TASK_PROPORTION)) return PACSTRAP_ERROR_MSG ; printf("[PACSTRAP-GUI]: ls /etc/skel") ; QProcess::execute(QString("/bin/sh -c \"ls -al /etc/skel/\"" ) ) ; printf("[PACSTRAP-GUI]: ls chroot/etc/skel/") ; QProcess::execute(QString("/bin/sh -c \"ls -al %1/etc/skel/\"" ).arg(MOUNTPOINT)) ; printf("[PACSTRAP-GUI]: ls chroot/etc/wallpaper.png") ; QProcess::execute(QString("/bin/sh -c \"ls -al %1/etc/wallpaper.png\"").arg(MOUNTPOINT)) ; printf("[PACSTRAP-GUI]: ls chroot/etc/sudoers*") ; QProcess::execute(QString("/bin/sh -c \"ls -al %1/etc/sudoers*\"" ).arg(MOUNTPOINT)) ; - if (!!ExecWithStatus(wallpaper_cmd)) return WALLPAPER_ERROR_MSG ; + if (!!execStatus(wallpaper_cmd)) return WALLPAPER_ERROR_MSG ; printf("[PACSTRAP-GUI]: ls chroot/etc/wallpaper.png") ; QProcess::execute(QString("/bin/sh -c \"ls -al %1/etc/wallpaper.png\"").arg(MOUNTPOINT)) ; @@ -77,4 +71,10 @@ printf("[PACSTRAP-GUI]: ls chroot/etc/wallpaper.png") ; QProcess::execute(QStrin } +/* PacstrapGuiJob private class constants */ + +const QString PacstrapGuiJob::WALLPAPER_FMT = "cp /etc/wallpaper.png %1/etc/" ; +const QString PacstrapGuiJob::WALLPAPER_ERROR_MSG = "The wallpaper installation command has failed." ; + + CALAMARES_PLUGIN_FACTORY_DEFINITION(PacstrapGuiJobFactory , registerPlugin<PacstrapGuiJob>() ;) |