diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2018-05-03 14:34:54 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2018-05-27 06:26:01 -0400 |
| commit | c6c04f36f0f2112d00dc13ee23cb4668e6f23adf (patch) | |
| tree | 69bcb0cf273fbe5229268a935a1d8e517257b40f | |
| parent | 652e8bae8cf56ea0eaa0bc2b4470db51136715a8 (diff) | |
housekeeping
| -rw-r--r-- | src/libcalamaresui/utils/CalamaresUtilsGui.h | 2 | ||||
| -rw-r--r-- | src/modules/pacstrap-gui/pacstrap-gui.cpp | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h index b64133455..8289df602 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.h +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h @@ -123,7 +123,7 @@ UIDLLEXPORT QSize defaultIconSize(); constexpr int windowMinimumWidth = 800; constexpr int windowMinimumHeight = 520; constexpr int windowPreferredWidth = 1024; -constexpr int windowPreferredHeight = 520; +constexpr int windowPreferredHeight = 530; } #endif // CALAMARESUTILSGUI_H diff --git a/src/modules/pacstrap-gui/pacstrap-gui.cpp b/src/modules/pacstrap-gui/pacstrap-gui.cpp index e9137eda7..b70093918 100644 --- a/src/modules/pacstrap-gui/pacstrap-gui.cpp +++ b/src/modules/pacstrap-gui/pacstrap-gui.cpp @@ -39,8 +39,7 @@ const QString PacstrapGuiJob::SET_XKBMAP_FMT = "echo 'setxkbmap %1' const QString PacstrapGuiJob::DM_DESKTOP_FMT = "sed -i 's|^Session=.*|Session=%1|' %2/etc/skel/.dmrc" ; const QString PacstrapGuiJob::DM_LANG_FMT = "sed -i 's|^Language=.*|Language=%1|' %2/etc/skel/.dmrc" ; const QString PacstrapGuiJob::WELCOME_TITLE_FMT = "sed -i 's|_EDITION_TITLE_|Parabola GNU/Linux-libre News|' %1/etc/skel/.config/autostart/autostart.sh" ; -const QString PacstrapGuiJob::WELCOME_TEXT_FMT = "cp /usr/share/calamares/welcome %1/usr/lib/parabola-laf/news-0" ; -const QString PacstrapGuiJob::WELCOME_SED_FMT = "sed -i 's|_DEFAULT_DESKTOP_|%1|' %2/usr/lib/parabola-laf/news-0" ; +const QString PacstrapGuiJob::WELCOME_TEXT_FMT = "sed 's|_DEFAULT_DESKTOP_|%1|' /usr/share/calamares/welcome > %2/usr/share/parabola-laf/news/news-0" ; const QString PacstrapGuiJob::OCTOPI_FMT = "rm -f %1/etc/xdg/autostart/octopi-notifier.desktop" ; @@ -91,8 +90,7 @@ QString PacstrapGuiJob::chrootExec() QString dm_desktop_cmd = QString(DM_DESKTOP_FMT ).arg(default_desktop , this->mountPoint) ; QString dm_lang_cmd = QString(DM_LANG_FMT ).arg(locale , this->mountPoint) ; QString welcome_title_cmd = QString(WELCOME_TITLE_FMT).arg( this->mountPoint) ; - QString welcome_text_cmd = QString(WELCOME_TEXT_FMT ).arg( this->mountPoint) ; - QString welcome_sed_cmd = QString(WELCOME_SED_FMT ).arg(default_desktop , this->mountPoint) ; + QString welcome_text_cmd = QString(WELCOME_TEXT_FMT ).arg(default_desktop , this->mountPoint) ; QString octopi_cmd = QString(OCTOPI_FMT ).arg( this->mountPoint) ; printf("[PACSTRAP-GUI]: ls host/etc/skel%s\n" , execOutput( "ls -al /etc/skel" ) .toStdString().c_str()) ; @@ -121,7 +119,6 @@ printf("[PACSTRAP-GUI]: ls -al chroot/etc/skel/ OUT\n%s\n" , execOutput(QString( if (!!execStatus(dm_lang_cmd )) return "DM_LANG_FMT ERROR_MSG" ; if (!!execStatus(welcome_title_cmd )) return "WELCOME_TITLE_FMT ERROR_MSG" ; if (!!execStatus(welcome_text_cmd )) return "WELCOME_TEXT_FMT ERROR_MSG" ; - if (!!execStatus(welcome_sed_cmd )) return "WELCOME_SED_FMT ERROR_MSG" ; if (default_desktop == LXDE_PACKAGES_KEY && !!execStatus(octopi_cmd )) return "OCTOPI_FMT ERROR_MSG" ; |