summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2018-04-23 06:09:31 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2018-05-27 06:26:01 -0400
commit652e8bae8cf56ea0eaa0bc2b4470db51136715a8 (patch)
treed84634bd9bd7b06b363e19882e632c2b9d499da2
parent1e16a612d2bcfe1fa77354b4aec62f8aea6dc8a2 (diff)
housekeeping
-rwxr-xr-xmk2
-rw-r--r--src/libcalamares/PacstrapCppJob.cpp1
-rw-r--r--src/libcalamares/PacstrapCppJob.h14
3 files changed, 9 insertions, 8 deletions
diff --git a/mk b/mk
index 48e0295ae..6eff7e26c 100755
--- a/mk
+++ b/mk
@@ -8,7 +8,7 @@ readonly RUN_INSTALLED=1
function print() { printf "\033[01;34m%s\033[00m\n" "$(echo -e $*)" ; }
-sudo echo
+sudo echo -n
if pacman --version 2> /dev/null | grep libalpm > /dev/null
then print "\n--- running pacman ---\n"
BASE_PKGS="$(pacman -Qg base-devel | cut -d ' ' -f 2)"
diff --git a/src/libcalamares/PacstrapCppJob.cpp b/src/libcalamares/PacstrapCppJob.cpp
index e9d5f7658..8f97114da 100644
--- a/src/libcalamares/PacstrapCppJob.cpp
+++ b/src/libcalamares/PacstrapCppJob.cpp
@@ -131,6 +131,7 @@ PacstrapCppJob::PacstrapCppJob(const char* job_name , const char* status_msg ,
this->progressPercent = 0 ;
execStatus("sed 's|^chroot_setup |#chroot_setup |' /usr/bin/pacstrap > /usr/bin/pacstrap-calamares") ;
+ execStatus("chmod +x /usr/bin/pacstrap-calamares") ;
}
PacstrapCppJob::~PacstrapCppJob()
diff --git a/src/libcalamares/PacstrapCppJob.h b/src/libcalamares/PacstrapCppJob.h
index 6b431e03b..7f5092b13 100644
--- a/src/libcalamares/PacstrapCppJob.h
+++ b/src/libcalamares/PacstrapCppJob.h
@@ -188,13 +188,13 @@ private:
# define DEBUG_TRACE_BASEPACKAGES \
printf("[PACSTRAP-GUI]: installing initsystem: %s\n" , \
init_key.toStdString().c_str() ) ;
-# define DEBUG_TRACE_DESKTOPPACKAGES \
- printf("[PACSTRAP-GUI]: installing initsystem: %s default_desktop: %s" , \
- init_key .toStdString().c_str() , \
- desktop_key.toStdString().c_str() ) ; \
- printf("language_packs: %s for locale: %s\n" , \
- language_packs.join(' ').toStdString().c_str() , \
- locale .toStdString().c_str() ) ;
+# define DEBUG_TRACE_DESKTOPPACKAGES \
+ printf("[PACSTRAP-GUI]: installing initsystem: %s default_desktop: %s" , \
+ init_key .toStdString().c_str() , \
+ desktop_key.toStdString().c_str() ) ; \
+ printf("language_packs: %s for locale: %s\n" , \
+ LANGUAGE_PACKS.values(locale).join(' ').toStdString().c_str() , \
+ locale .toStdString().c_str() ) ;
#else // QT_NO_DEBUG
# define DEBUG_TRACE_BASEPACKAGES ;
# define DEBUG_TRACE_DESKTOPPACKAGES ;