squashme - housekeepingv3.1.9-parabola7

4 files changed, 11 insertions, 5 deletions

diff --git a/data/welcome b/data/welcome
index b78478a53..cd9383f62 100644
--- a/data/welcome
+++ b/data/welcome
@@ -4,7 +4,13 @@ Please report any installation problems to the Parabola 'Installation Media' bug
 or any bugs that you may find with any of the software in the repositories
 to the Parabola 'Packages' bug tracker (the 'Report a Bug' desktop shortcut).
 
-There is much documentation about Parabola on the wiki <https://wiki.parabola.nu/>.
+There is much documentation about Parabola on the wiki.
 If you have any other questions or comments, feel free to join the 'Assist' mailing list
-<https://lists.parabola.nu/mailman/listinfo/assist>
 or the Parabola support chat (the 'Parabola IRC Channel' desktop shortcut).
+
+
+Parabola Wiki:
+  <https://wiki.parabola.nu/>
+
+Parabola Mailing List:
+  <https://lists.parabola.nu/mailman/listinfo/assist>
diff --git a/src/libcalamares/PacstrapCppJob.cpp b/src/libcalamares/PacstrapCppJob.cpp
index 8fd0ecdd1..364f4a2a8 100644
--- a/src/libcalamares/PacstrapCppJob.cpp
+++ b/src/libcalamares/PacstrapCppJob.cpp
@@ -135,7 +135,7 @@ PacstrapCppJob::PacstrapCppJob(const char* job_name   , const char* status_msg ,
 
 PacstrapCppJob::~PacstrapCppJob()
 {
-  execStatus("rm /usr/bin/pacstrap-calamares") ;
+  execStatus("rm /usr/bin/pacstrap-calamares || true") ;
 }
 
 
diff --git a/src/modules/pacstrap-base/pacstrap-base.cpp b/src/modules/pacstrap-base/pacstrap-base.cpp
index 92dd09f52..73825667f 100644
--- a/src/modules/pacstrap-base/pacstrap-base.cpp
+++ b/src/modules/pacstrap-base/pacstrap-base.cpp
@@ -53,7 +53,7 @@ QString PacstrapBaseJob::getPackageList()
 
 /* PacstrapBaseJob protected instance methods */
 
-QString PacstrapBaseJob::chrootExecPreInstall() {}
+QString PacstrapBaseJob::chrootExecPreInstall() { return QString("") ; }
 
 QString PacstrapBaseJob::chrootExecPostInstall()
 {
diff --git a/src/modules/pacstrap-gui/pacstrap-gui.cpp b/src/modules/pacstrap-gui/pacstrap-gui.cpp
index 67a46f694..bb5a7fa85 100644
--- a/src/modules/pacstrap-gui/pacstrap-gui.cpp
+++ b/src/modules/pacstrap-gui/pacstrap-gui.cpp
@@ -76,7 +76,7 @@ DEBUG_TRACE_DESKTOPPACKAGES
 
 /* PacstrapGuiJob protected instance methods */
 
-QString PacstrapGuiJob::chrootExecPreInstall() {}
+QString PacstrapGuiJob::chrootExecPreInstall() { return QString("") ; }
 
 QString PacstrapGuiJob::chrootExecPostInstall()
 {