From 8271bb6e5ce7aab9a4bc35bd96ce9467240c94ca Mon Sep 17 00:00:00 2001
From: Stefano Capitani <stefano@manjaro.org>
Date: Wed, 18 Jul 2018 22:49:27 +0200
Subject: [PATCH 01/34] Add comment

---
 lib/util.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/util.sh b/lib/util.sh
index ae7f103..c62c7f4 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -568,7 +568,8 @@ load_pkgs(){
             fi
         ;;
     esac
-
+    
+# We can reuse this code
     local _edition _edition_rm
     case "${edition}" in
         'sonar')

From bbd9aaba242225805e6436853f307e4534b50c83 Mon Sep 17 00:00:00 2001
From: Stefano Capitani <stefano@manjaro.org>
Date: Wed, 18 Jul 2018 22:56:26 +0200
Subject: [PATCH 02/34] removed sonar tips

---
 lib/util-iso-image.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 26fb935..dbd30f6 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -188,9 +188,9 @@ configure_thus(){
     echo "INITRAMFS = \"$(echo ${default_image} | sed s'|/boot/||')\"" >> "$conf"
     echo "FALLBACK = \"$(echo ${fallback_image} | sed s'|/boot/||')\"" >> "$conf"
 
-    if [[ -f $1/usr/share/applications/thus.desktop && -f $1/usr/bin/kdesu ]]; then
-        sed -i -e 's|sudo|kdesu|g' $1/usr/share/applications/thus.desktop
-    fi
+#    if [[ -f $1/usr/share/applications/thus.desktop && -f $1/usr/bin/kdesu ]]; then
+#        sed -i -e 's|sudo|kdesu|g' $1/usr/share/applications/thus.desktop
+#    fi
 }
 
 configure_live_image(){
@@ -199,7 +199,7 @@ configure_live_image(){
     configure_system "$1"
     configure_services "$1"
     configure_calamares "$1"
-    [[ ${edition} == "sonar" ]] && configure_thus "$1"
+#    [[ ${edition} == "sonar" ]] && configure_thus "$1"
     write_live_session_conf "$1"
     msg "Done configuring [livefs]"
 }

From 467a57b122a554dad330494259909f04edffae4b Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Sun, 16 Sep 2018 18:29:35 +0200
Subject: [PATCH 03/34] Add init profiles repo functions

---
 bin/buildiso.in | 12 +++++++-----
 lib/util.sh     | 21 ++++++++++++++++++++-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/bin/buildiso.in b/bin/buildiso.in
index 8642598..bc4e7e6 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -9,14 +9,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+version=0.15.9
 
-LIBDIR='@libdir@'
-DATADIR='@datadir@'
-SYSCONFDIR='@sysconfdir@'
+LIBDIR='/usr/lib/manjaro-tools'
+DATADIR='/usr/share/manjaro-tools'
+SYSCONFDIR='/etc/manjaro-tools'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-
 import ${LIBDIR}/util.sh
 
 show_profile(){
@@ -56,6 +55,7 @@ display_settings(){
     show_config
 
     msg "PROFILE:"
+    msg2 "gitlab brach: %s" "${branch}"
     msg2 "build_lists: %s" "$(show_build_lists ${list_dir_iso})"
     msg2 "build_list_iso: %s" "${build_list_iso}"
     msg2 "is_build_list: %s" "${is_build_list}"
@@ -89,6 +89,8 @@ load_user_info
 
 load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
 
+init_profiles 
+
 # to force old way to have buildiso run in iso-profiles dir
 # run_dir=$(pwd)
 
diff --git a/lib/util.sh b/lib/util.sh
index c62c7f4..d1edb67 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -316,6 +316,8 @@ init_buildiso(){
     iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")
 
     [[ -z ${kernel} ]] && kernel="linux414"
+    
+    [[ -z ${branch} ]] && branch="v17.1" #current branch release
 
     [[ -z ${gpgkey} ]] && gpgkey=''
 
@@ -386,7 +388,7 @@ load_profile_config(){
     [[ -z ${login_shell} ]] && login_shell='/bin/bash'
 
     if [[ -z ${addgroups} ]]; then
-        addgroups="audio,disk,lp,network,optical,power,scanner,storage,video,wheel"
+        addgroups="lp,network,power,sys,wheel"
     fi
 
     if [[ -z ${enable_systemd[@]} ]]; then
@@ -764,3 +766,20 @@ create_chksums() {
     sha1sum $1 > $1.sha1
     sha256sum $1 > $1.sha256
 }
+
+init_profiles() {	
+	_workdir='/usr/share/manjaro-tools'
+	if [[ -d ${_workdir}/iso-profiles ]]; then
+		rm -Rf ${_workdir}/iso-profiles ]]
+	fi
+	git clone -q --depth 1 -b ${branch} https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git ${_workdir}/iso-profiles/
+	
+	for i in ${_workdir}/iso-profiles/.gitignore ${_workdir}/iso-profiles/README.md; do
+		rm -f $i
+	done
+		
+	for i in ${_workdir}/iso-profiles/.git ${_workdir}/iso-profiles/sonar; do
+		rm -Rf $i
+	done
+}
+

From 68c1489d0cd9609e6fdb590c875893ad297c1500 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Sun, 16 Sep 2018 18:35:25 +0200
Subject: [PATCH 04/34] Corrections

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 bin/buildiso.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/buildiso.in b/bin/buildiso.in
index bc4e7e6..1327870 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -11,9 +11,9 @@
 
 version=0.15.9
 
-LIBDIR='/usr/lib/manjaro-tools'
-DATADIR='/usr/share/manjaro-tools'
-SYSCONFDIR='/etc/manjaro-tools'
+LIBDIR='@libdir@'
+DATADIR='@datadir@'
+SYSCONFDIR='@sysconfdir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh

From f3fb001d360e94abdb5a9383c78c25b43aa004d8 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Sun, 16 Sep 2018 18:38:36 +0200
Subject: [PATCH 05/34] correct manjaro-tools.conf

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 data/manjaro-tools.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index a020836..8ac11ca 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -37,6 +37,9 @@
 
 ################ buildiso ################
 
+#default branch for iso-profiles repo: v17.1>current release | master>development release
+# branch=v17.1
+
 # default iso build list; name without .list extension
 # build_list_iso=default
 

From ee261705fbc71c78f083737acc4ddbd767f56275 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Sun, 16 Sep 2018 18:54:56 +0200
Subject: [PATCH 06/34] Damn it missed also this

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 bin/buildiso.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/buildiso.in b/bin/buildiso.in
index 1327870..7c9091b 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -9,7 +9,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=0.15.9
+version=@version@
 
 LIBDIR='@libdir@'
 DATADIR='@datadir@'

From 5237a2cb4ef26e2acd1294a62d7ffe400d3fc946 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Mon, 17 Sep 2018 19:38:05 +0200
Subject: [PATCH 07/34] Add -0 flag to use for download our profiles. Now only
 when passed the flag the iso-profiles are created. Update also the README to
 describe this flag.

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 README.md       | 12 ++++++++++++
 bin/buildiso.in | 14 +++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9c5bc4b..e40c7bf 100644
--- a/README.md
+++ b/README.md
@@ -88,6 +88,9 @@ overriding
 
 ################ buildiso ################
 
+#default branch for iso-profiles repo: v17.1>current release | master>development release
+# branch=v17.1
+
 # default iso build list; name without .list extension
 # build_list_iso=default
 
@@ -197,6 +200,7 @@ buildiso is used to build manjaro-iso-profiles. It is run insde the profiles fol
 ~~~
 $ buildiso -h
 Usage: buildiso [options]
+    -0                 Initialize iso-profiles repo [default: v17.1]"
     -a <arch>          Arch [default: auto]
     -b <branch>        Branch [default: stable]
     -c                 Disable clean work dir
@@ -221,6 +225,14 @@ Usage: buildiso [options]
 
 ###### * build xfce iso profile for both arches and branch testing on x86_64 build system
 
+* Remember: if you run buildiso for the first time you need to do:
+
+~~~
+buildiso -0
+~~~
+
+for download in /usr/share/manjaro-tools/iso-profiles our manjaro profiles. You can override in manjaro-tools.conf what branch use with buildiso: v17.1 or master ( development profiles ). The previous command can be used to refresh the profiles as needed in your local.
+
 * i686 (buildsystem is x86_64)
 
 ~~~
diff --git a/bin/buildiso.in b/bin/buildiso.in
index 7c9091b..e5bf3d9 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -89,8 +89,6 @@ load_user_info
 
 load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
 
-init_profiles 
-
 # to force old way to have buildiso run in iso-profiles dir
 # run_dir=$(pwd)
 
@@ -102,9 +100,11 @@ images_only=false
 iso_only=false
 verbose=false
 persist=false
+initialize=false
 
 usage() {
     echo "Usage: ${0##*/} [options]"
+    echo "    -0                 Initialize iso-profiles repo [default: ${branch}]"
     echo "    -p <profile>       Buildset or profile [default: ${build_list_iso}]"
     echo "    -a <arch>          Arch [default: ${target_arch}]"
     echo "    -b <branch>        Branch [default: ${target_branch}]"
@@ -134,10 +134,11 @@ usage() {
 
 orig_argv=("$@")
 
-opts='p:a:b:r:t:k:i:g:d:cfzxmvqh'
+opts='p:a:b:r:t:k:i:g:d:cfzxmvqh0'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
+     	0) initialize=true ;;
         a) target_arch="$OPTARG" ;;
         b) target_branch="$OPTARG" ;;
         c) clean_first=false ;;
@@ -160,6 +161,13 @@ done
 
 shift $(($OPTIND - 1))
 
+if ${initialize}; then
+	msg "Initialize iso profiles ${branch}"
+	init_profiles
+	msg2 "Done: iso profiles are stored in /usr/share/manjaro-tools/iso-profiles"
+	exit 1
+fi
+
 timer_start=$(get_timer)
 
 check_root "$0" "${orig_argv[@]}"

From 26b1110acd085beaed1c120f396bb60e90ee321b Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Wed, 19 Sep 2018 22:20:46 +0200
Subject: [PATCH 08/34] Change -0 in -I

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 README.md       | 4 ++--
 bin/buildiso.in | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e40c7bf..be362b9 100644
--- a/README.md
+++ b/README.md
@@ -200,7 +200,7 @@ buildiso is used to build manjaro-iso-profiles. It is run insde the profiles fol
 ~~~
 $ buildiso -h
 Usage: buildiso [options]
-    -0                 Initialize iso-profiles repo [default: v17.1]"
+    -I                 Initialize iso-profiles repo [default: v17.1]"
     -a <arch>          Arch [default: auto]
     -b <branch>        Branch [default: stable]
     -c                 Disable clean work dir
@@ -228,7 +228,7 @@ Usage: buildiso [options]
 * Remember: if you run buildiso for the first time you need to do:
 
 ~~~
-buildiso -0
+buildiso -I
 ~~~
 
 for download in /usr/share/manjaro-tools/iso-profiles our manjaro profiles. You can override in manjaro-tools.conf what branch use with buildiso: v17.1 or master ( development profiles ). The previous command can be used to refresh the profiles as needed in your local.
diff --git a/bin/buildiso.in b/bin/buildiso.in
index e5bf3d9..e77cc90 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -104,7 +104,7 @@ initialize=false
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -0                 Initialize iso-profiles repo [default: ${branch}]"
+    echo "    -I                 Initialize iso-profiles repo [default: ${branch}]"
     echo "    -p <profile>       Buildset or profile [default: ${build_list_iso}]"
     echo "    -a <arch>          Arch [default: ${target_arch}]"
     echo "    -b <branch>        Branch [default: ${target_branch}]"
@@ -134,11 +134,11 @@ usage() {
 
 orig_argv=("$@")
 
-opts='p:a:b:r:t:k:i:g:d:cfzxmvqh0'
+opts='p:a:b:r:t:k:i:g:d:cfzxmvqhI'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-     	0) initialize=true ;;
+     	I) initialize=true ;;
         a) target_arch="$OPTARG" ;;
         b) target_branch="$OPTARG" ;;
         c) clean_first=false ;;

From 63b4efcd256e6336f668273cfa52a4cb5a363b3f Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Thu, 20 Sep 2018 19:06:17 +0200
Subject: [PATCH 09/34] Since i use silent mode in github i added a simple
 check to verify the presence of the profiles and if not a message inform the
 user to check the internet connection or browse the gitlab repository

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/util.sh b/lib/util.sh
index d1edb67..9155390 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -774,12 +774,18 @@ init_profiles() {
 	fi
 	git clone -q --depth 1 -b ${branch} https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git ${_workdir}/iso-profiles/
 	
-	for i in ${_workdir}/iso-profiles/.gitignore ${_workdir}/iso-profiles/README.md; do
+	#Check if git clone is done
+	if [[ -d ${_workdir}/iso-profiles/manjaro ]] && [[ -d ${_workdir}/iso-profiles/community ]]; then
+	
+		for i in ${_workdir}/iso-profiles/.gitignore ${_workdir}/iso-profiles/README.md; do
 		rm -f $i
-	done
+		done
 		
-	for i in ${_workdir}/iso-profiles/.git ${_workdir}/iso-profiles/sonar; do
-		rm -Rf $i
-	done
+		for i in ${_workdir}/iso-profiles/.git ${_workdir}/iso-profiles/sonar; do
+			rm -Rf $i
+		done
+	else msg2 "Impossible to initialize iso-profiles, please check internet connection or browse at 'https://gitlab.manjaro.org/profiles-and-settings/iso-profiles'"
+	exit 1
+	fi
 }
 

From 867cf4cff2416bd2dccc6a4a030802ee9df83653 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Sun, 23 Sep 2018 17:46:34 +0200
Subject: [PATCH 10/34] Done -i flag > initialize iso-profiles folder as user
 request

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 README.md       | 4 ++--
 bin/buildiso.in | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index be362b9..f317434 100644
--- a/README.md
+++ b/README.md
@@ -200,7 +200,7 @@ buildiso is used to build manjaro-iso-profiles. It is run insde the profiles fol
 ~~~
 $ buildiso -h
 Usage: buildiso [options]
-    -I                 Initialize iso-profiles repo [default: v17.1]"
+    -i                 Initialize iso-profiles repo [default: v17.1]"
     -a <arch>          Arch [default: auto]
     -b <branch>        Branch [default: stable]
     -c                 Disable clean work dir
@@ -228,7 +228,7 @@ Usage: buildiso [options]
 * Remember: if you run buildiso for the first time you need to do:
 
 ~~~
-buildiso -I
+buildiso -i
 ~~~
 
 for download in /usr/share/manjaro-tools/iso-profiles our manjaro profiles. You can override in manjaro-tools.conf what branch use with buildiso: v17.1 or master ( development profiles ). The previous command can be used to refresh the profiles as needed in your local.
diff --git a/bin/buildiso.in b/bin/buildiso.in
index e77cc90..c1e87f1 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -104,7 +104,7 @@ initialize=false
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -I                 Initialize iso-profiles repo [default: ${branch}]"
+    echo "    -i                 Initialize iso-profiles repo [default: ${branch}]"
     echo "    -p <profile>       Buildset or profile [default: ${build_list_iso}]"
     echo "    -a <arch>          Arch [default: ${target_arch}]"
     echo "    -b <branch>        Branch [default: ${target_branch}]"
@@ -134,11 +134,11 @@ usage() {
 
 orig_argv=("$@")
 
-opts='p:a:b:r:t:k:i:g:d:cfzxmvqhI'
+opts='p:a:b:r:t:k:g:d:cfzxmvqhi'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-     	I) initialize=true ;;
+     	i) initialize=true ;;
         a) target_arch="$OPTARG" ;;
         b) target_branch="$OPTARG" ;;
         c) clean_first=false ;;

From 4f94991a17ff241dfce7d1667d048b8bf1333b1a Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Thu, 27 Sep 2018 21:58:19 +0200
Subject: [PATCH 11/34] Add statment to parse right branch if we use git clone
 instead of buildiso -i

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/util.sh b/lib/util.sh
index 9155390..1a4ca63 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -317,6 +317,15 @@ init_buildiso(){
 
     [[ -z ${kernel} ]] && kernel="linux414"
     
+    load_run_dir "${profile_repo}"
+    
+    if [[ -d ${run_dir}/.git ]]; then
+    	cd ${run_dir}
+    	branch=$(git rev-parse --abbrev-ref HEAD)
+    else
+    	[[ -z ${branch} ]] && branch="v17.1" #current branch release
+    fi
+  
     [[ -z ${branch} ]] && branch="v17.1" #current branch release
 
     [[ -z ${gpgkey} ]] && gpgkey=''

From 84c70221ce3779f5b903c116711c568a95a8dd9e Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Fri, 28 Sep 2018 22:21:21 +0200
Subject: [PATCH 12/34] This commit solve the issue during buildpkg: set the
 right working tree path

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util.sh b/lib/util.sh
index 1a4ca63..5deea77 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -320,13 +320,13 @@ init_buildiso(){
     load_run_dir "${profile_repo}"
     
     if [[ -d ${run_dir}/.git ]]; then
+    	current_path=$(pwd)
     	cd ${run_dir}
     	branch=$(git rev-parse --abbrev-ref HEAD)
+    	cd ${current_path}
     else
     	[[ -z ${branch} ]] && branch="v17.1" #current branch release
     fi
-  
-    [[ -z ${branch} ]] && branch="v17.1" #current branch release
 
     [[ -z ${gpgkey} ]] && gpgkey=''
 

From 7106e97c776fe8287cfbce66c6eed6e25e9e390d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Tue, 2 Oct 2018 20:12:02 +0200
Subject: [PATCH 13/34] [util-iso-boot] set grubenv for grub-quiet

---
 lib/util-iso-boot.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh
index 18e3e33..2057eda 100644
--- a/lib/util-iso-boot.sh
+++ b/lib/util-iso-boot.sh
@@ -87,6 +87,9 @@ prepare_grub(){
     cp ${data}/unicode.pf2 ${grub}
     cp -r ${data_live}/{locales,tz} ${grub}
 
+    msg2 "Set menu_show_once=1 in '${grub}/grubenv'"
+    grub-editenv ${grub}/grubenv set menu_show_once=1
+
     local size=4M mnt="${mnt_dir}/efiboot" efi_img="$2/efi.img"
     msg2 "Creating fat image of %s ..." "${size}"
     truncate -s ${size} "${efi_img}"

From 1a9ef7c5a499743320097d2169e7cd6192a9fd61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Mon, 15 Oct 2018 21:24:04 +0200
Subject: [PATCH 14/34] [util-yaml] use different geoip service

---
 lib/util-yaml.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index a1a68e2..96399d7 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -257,7 +257,7 @@ write_locale_conf(){
     echo "---" > "$conf"
     echo "localeGenPath: /etc/locale.gen" >> "$conf"
     if ${geoip}; then
-        echo "geoipUrl: https://geoip.tools/v1" >> "$conf"
+        echo "geoipUrl: http://ip-api.com/json" >> "$conf"
         echo "geoipStyle: legacy" >> "$conf"
     else
         echo "region: America" >> "$conf"

From 691bfbe4cb50557e8bf1db87f33a2746657e3150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 21 Oct 2018 08:52:19 +0200
Subject: [PATCH 15/34] [util-yaml] update ip path

---
 lib/util-yaml.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index 96399d7..34b5819 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -257,7 +257,7 @@ write_locale_conf(){
     echo "---" > "$conf"
     echo "localeGenPath: /etc/locale.gen" >> "$conf"
     if ${geoip}; then
-        echo "geoipUrl: http://ip-api.com/json" >> "$conf"
+        echo "geoipUrl: http://ip-api.com" >> "$conf"
         echo "geoipStyle: legacy" >> "$conf"
     else
         echo "region: America" >> "$conf"

From 61dafad5851963293e46097d04a8f940309a5327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 21 Oct 2018 09:11:32 +0200
Subject: [PATCH 16/34] [util-yaml] use kde.org service

---
 lib/util-yaml.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index 34b5819..a4a280d 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -257,8 +257,8 @@ write_locale_conf(){
     echo "---" > "$conf"
     echo "localeGenPath: /etc/locale.gen" >> "$conf"
     if ${geoip}; then
-        echo "geoipUrl: http://ip-api.com" >> "$conf"
-        echo "geoipStyle: legacy" >> "$conf"
+        echo "geoipUrl: https://geoip.kde.org/v1/calamares" >> "$conf"
+        echo "geoipStyle: json" >> "$conf"
     else
         echo "region: America" >> "$conf"
         echo "zone: New_York" >> "$conf"

From 8f4742cd4a627209e2e81fe1a7dd0806b8929d7e Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Thu, 1 Nov 2018 18:14:19 +0100
Subject: [PATCH 17/34] Removed from buildtree the manjaro stuff

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 bin/buildtree.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/buildtree.in b/bin/buildtree.in
index 4c1aad6..de057ea 100644
--- a/bin/buildtree.in
+++ b/bin/buildtree.in
@@ -23,7 +23,7 @@ display_settings(){
     show_config
 
     msg "ARGS:"
-    msg2 "sync: %s" "${sync}"
+  # msg2 "sync: %s" "${sync}"
     msg2 "abs: %s" "${abs}"
     msg2 "clean: %s" "${clean}"
 
@@ -38,14 +38,14 @@ load_user_info
 
 load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
 
-sync=false
+#sync=false
 pretend=false
 abs=false
 clean=false
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -s            Sync manjaro tree"
+   #echo "    -s            Sync manjaro tree"
     echo "    -a            Sync arch abs"
     echo '    -c            Clean package tree'
     echo '    -q            Query settings'
@@ -57,14 +57,14 @@ usage() {
 
 orig_argv=("$@")
 
-opts='sacqh'
+opts='acqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         a) abs=true ;;
         c) clean=true ;;
         q) pretend=true ;;
-        s) sync=true ;;
+       #s) sync=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
@@ -80,6 +80,6 @@ ${pretend} && display_settings && exit 1
 
 ${clean} && clean_dir "${tree_dir}"
 
-${sync} && sync_tree_manjaro
+#${sync} && sync_tree_manjaro
 
 ${abs} && sync_tree_abs

From 31249fa9fd147696cf389beaf0c7762ef596b3f3 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Fri, 2 Nov 2018 18:41:23 +0100
Subject: [PATCH 18/34] Adopt by default kernel 4.19 and master branch. Note
 when we decide to create a v18.0 branch we need to change it

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 data/manjaro-tools.conf | 10 +++++-----
 lib/util.sh             |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index 8ac11ca..0b2d2a9 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -37,17 +37,17 @@
 
 ################ buildiso ################
 
-#default branch for iso-profiles repo: v17.1>current release | master>development release
-# branch=v17.1
+#default branch for iso-profiles repo: master>current release
+# branch=master
 
 # default iso build list; name without .list extension
 # build_list_iso=default
 
 # the dist release; default: auto
-# dist_release=17.1
+# dist_release=18.0
 
 # the dist codename; default: auto
-# dist_codename=Hakoila
+# dist_codename=Illyria
 
 # the branding; default: auto
 # dist_branding="MJRO"
@@ -57,7 +57,7 @@
 # iso_compression=xz
 
 # unset defaults to given value
-# kernel="linux414"
+# kernel="linux419"
 
 # gpg key; leave empty or commented to skip sfs signing
 # gpgkey=""
diff --git a/lib/util.sh b/lib/util.sh
index 5deea77..aa7d5bd 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -315,7 +315,7 @@ init_buildiso(){
 
     iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")
 
-    [[ -z ${kernel} ]] && kernel="linux414"
+    [[ -z ${kernel} ]] && kernel="linux419"
     
     load_run_dir "${profile_repo}"
     
@@ -325,7 +325,7 @@ init_buildiso(){
     	branch=$(git rev-parse --abbrev-ref HEAD)
     	cd ${current_path}
     else
-    	[[ -z ${branch} ]] && branch="v17.1" #current branch release
+    	[[ -z ${branch} ]] && branch="master" #current branch release
     fi
 
     [[ -z ${gpgkey} ]] && gpgkey=''

From ec51e92babe6401ac1e311022f584c340b192b96 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Mon, 5 Nov 2018 19:15:34 +0100
Subject: [PATCH 19/34] Adopt v18.0 branch by default

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 data/manjaro-tools.conf | 4 ++--
 lib/util.sh             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index 0b2d2a9..9df8534 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -37,8 +37,8 @@
 
 ################ buildiso ################
 
-#default branch for iso-profiles repo: master>current release
-# branch=master
+#default branch for iso-profiles repo: v18.0 Illyria master>development release
+# branch=v18.0
 
 # default iso build list; name without .list extension
 # build_list_iso=default
diff --git a/lib/util.sh b/lib/util.sh
index aa7d5bd..db72b66 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -325,7 +325,7 @@ init_buildiso(){
     	branch=$(git rev-parse --abbrev-ref HEAD)
     	cd ${current_path}
     else
-    	[[ -z ${branch} ]] && branch="master" #current branch release
+    	[[ -z ${branch} ]] && branch="v18.0" #current branch release
     fi
 
     [[ -z ${gpgkey} ]] && gpgkey=''

From 8d140615f67c5ca22971102749322b71d9e374d4 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Tue, 18 Dec 2018 17:33:55 -0500
Subject: [PATCH 20/34] First try to configure calamares branding via
 manjaro-tools

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util-iso-image.sh | 31 +++++++++++++++++++++++++++++++
 lib/util-iso.sh       |  2 ++
 2 files changed, 33 insertions(+)

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 6b72b64..57317e3 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -95,6 +95,37 @@ configure_lsb(){
     fi
 }
 
+configure_branding(){
+    if [ -e $1/usr/share/calamares/branding/manjaro/branding.desc ] ; then
+        msg2 "Configuring branding"
+        echo "---
+componentName:  manjaro
+
+strings:
+    productName:         Manjaro Linux
+    shortProductName:    Manjaro
+    version:             $dist_release
+    shortVersion:        $dist_release
+    versionedName:       Manjaro Linux $dist_release "$dist_codename"
+    shortVersionedName:  Manjaro $dist_release
+    bootloaderEntryName: Manjaro
+
+images:
+    productLogo:         "logo.png"
+    productIcon:         "logo.png"
+    productWelcome:      "languages.png"
+
+slideshow:               "show.qml"
+
+style:
+   sidebarBackground:    "#454948"
+   sidebarText:          "#efefef"
+   sidebarTextSelect:    "#9E4F5D"
+
+" > $1/usr/share/calamares/branding/manjaro/branding.desc
+    fi
+}
+
 configure_logind(){
     msg2 "Configuring logind ..."
     local conf=$1/etc/systemd/logind.conf
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index bcdd62c..f802095 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -260,6 +260,8 @@ make_image_root() {
 
         configure_lsb "${path}"
 
+        configure_branding "${path}"
+
         clean_up_image "${path}"
         : > ${work_dir}/build.${FUNCNAME}
         msg "Done [Base installation] (rootfs)"

From 08ba08e846f5a47b7f0d2a713924cf5cea7d16d1 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Tue, 18 Dec 2018 21:13:25 -0500
Subject: [PATCH 21/34] Fix calamares branding

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util-iso-image.sh | 14 ++++++--------
 lib/util-iso.sh       |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 57317e3..2d6f2da 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -96,18 +96,17 @@ configure_lsb(){
 }
 
 configure_branding(){
-    if [ -e $1/usr/share/calamares/branding/manjaro/branding.desc ] ; then
-        msg2 "Configuring branding"
-        echo "---
+    msg2 "Configuring branding"
+    echo "---
 componentName:  manjaro
 
 strings:
     productName:         Manjaro Linux
     shortProductName:    Manjaro
-    version:             $dist_release
-    shortVersion:        $dist_release
-    versionedName:       Manjaro Linux $dist_release "$dist_codename"
-    shortVersionedName:  Manjaro $dist_release
+    version:             ${dist_release}
+    shortVersion:        ${dist_release}
+    versionedName:       Manjaro Linux ${dist_release} "${dist_codename}"
+    shortVersionedName:  Manjaro ${dist_release}
     bootloaderEntryName: Manjaro
 
 images:
@@ -123,7 +122,6 @@ style:
    sidebarTextSelect:    "#9E4F5D"
 
 " > $1/usr/share/calamares/branding/manjaro/branding.desc
-    fi
 }
 
 configure_logind(){
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index f802095..fee1c31 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -260,8 +260,6 @@ make_image_root() {
 
         configure_lsb "${path}"
 
-        configure_branding "${path}"
-
         clean_up_image "${path}"
         : > ${work_dir}/build.${FUNCNAME}
         msg "Done [Base installation] (rootfs)"
@@ -313,6 +311,8 @@ make_image_live() {
         copy_overlay "${profile_dir}/live-overlay" "${path}"
         configure_live_image "${path}"
 
+        configure_branding "${path}"
+
         reset_pac_conf "${path}"
 
         umount_fs

From cb28eefe2d85f35aff4be623f354354fb13c5e9f Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Wed, 19 Dec 2018 10:22:47 -0500
Subject: [PATCH 22/34] Cosmetic change

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util-iso.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index fee1c31..cd35959 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -312,6 +312,7 @@ make_image_live() {
         configure_live_image "${path}"
 
         configure_branding "${path}"
+        msg "Done [Distribution: Release ${dist_release} Codename ${dist_codename}]"
 
         reset_pac_conf "${path}"
 

From e1b179cd454a2dec89c85eb7240e6034a393152a Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Tue, 22 Jan 2019 18:11:34 -0500
Subject: [PATCH 23/34] First commit calamares options into manjaro-tools.conf

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 Makefile                |  5 ++-
 data/branding.desc.d    | 87 +++++++++++++++++++++++++++++++++++++++++
 data/manjaro-tools.conf | 33 ++++++++++++++++
 lib/util-iso-image.sh   | 27 +------------
 lib/util.sh             | 22 +++++++++++
 5 files changed, 147 insertions(+), 27 deletions(-)
 create mode 100644 data/branding.desc.d

diff --git a/Makefile b/Makefile
index b3bec6e..08305c7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
-Version=0.15.8
+Version=0.15.9
 
 PREFIX = /usr/local
 SYSCONFDIR = /etc
 
 SYSCONF = \
-	data/manjaro-tools.conf
+	data/manjaro-tools.conf \
+	data/branding.desc.d
 
 BIN_BASE = \
 	bin/mkchroot \
diff --git a/data/branding.desc.d b/data/branding.desc.d
new file mode 100644
index 0000000..e04c8ac
--- /dev/null
+++ b/data/branding.desc.d
@@ -0,0 +1,87 @@
+---
+componentName:  manjaro
+
+# This selects between different welcome texts. When false, uses
+# the traditional "Welcome to the %1 installer.", and when true,
+# uses "Welcome to the Calamares installer for %1." This allows
+# to distinguish this installer from other installers for the
+# same distribution.
+welcomeStyleCalamares:   ${welcomestyle}
+
+# Should the welcome image (productWelcome, below) be scaled
+# up beyond its natural size? If false, the image does not grow
+# with the window but remains the same size throughout (this
+# may have surprising effects on HiDPI monitors).
+welcomeExpandingLogo:   ${welcomelogo}
+
+# Size and expansion policy for Calamares.
+#  - "normal" or unset, expand as needed, use *windowSize*
+#  - "fullscreen", start as large as possible, ignore *windowSize*
+#  - "noexpand", never expand, use *windowSize*
+windowExpanding:    ${windowexp}
+
+# Size of Calamares window, expressed as w,h. Both w and h
+# may be either pixels (suffix px) or font-units (suffix em).
+#   e.g.    "800px,600px"
+#           "60em,480px"
+# This setting is ignored if "fullscreen" is selected for
+# *windowExpanding*, above. If not set, use constants defined
+# in CalamaresUtilsGui, 800x520.
+windowSize: ${windowsize}
+
+# These are strings shown to the user in the user interface.
+# There is no provision for translating them -- since they
+# are names, the string is included as-is.
+#
+# The four Url strings are the Urls used by the buttons in
+# the welcome screen, and are not shown to the user. Clicking
+# on the "Support" button, for instance, opens the link supportUrl.
+# If a Url is empty, the corresponding button is not shown.
+#
+# bootloaderEntryName is how this installation / distro is named
+# in the boot loader (e.g. in the GRUB menu).
+strings:
+    productName:         ${dist_name} Linux
+    shortProductName:    ${dist_name}
+    version:             ${dist_release}
+    shortVersion:        ${dist_release}
+    versionedName:       ${dist_name} Linux ${dist_release} "${dist_codename}"
+    shortVersionedName:  ${dist_name} ${dist_release}
+    bootloaderEntryName: ${dist_name}
+
+# These images are loaded from the branding module directory.
+#
+# productIcon is used as the window icon, and will (usually) be used
+#       by the window manager to represent the application. This image
+#       should be square, and may be displayed by the window manager
+#       as small as 16x16 (but possibly larger).
+# productLogo is used as the logo at the top of the left-hand column
+#       which shows the steps to be taken. The image should be square,
+#       and is displayed at 80x80 pixels (also on HiDPI).
+# productWelcome is shown on the welcome page of the application in
+#       the middle of the window, below the welcome text. It can be
+#       any size and proportion, and will be scaled to fit inside
+#       the window. Use `welcomeExpandingLogo` to make it non-scaled.
+#       Recommended size is 320x150.
+images:
+    productLogo:         "logo.png"
+    productIcon:         "logo.png"
+    productWelcome:      "languages.png"
+
+# The slideshow is displayed during execution steps (e.g. when the
+# installer is actually writing to disk and doing other slow things).
+slideshow:               "show.qml"
+
+# Colors for text and background components.
+#
+#  - sidebarBackground is the background of the sidebar
+#  - sidebarText is the (foreground) text color
+#  - sidebarTextHighlight sets the background of the selected (current) step.
+#    Optional, and defaults to the application palette.
+#  - sidebarSelect is the text color of the selected step.
+#
+style:
+   sidebarBackground:    "${sidebackground}"
+   sidebarText:          "${sidebartext}"
+   sidebarTextSelect:    "${sidebartextselect}"
+   sidebarTextHighlight: "${sidebartexthighlight}"
diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index 9df8534..a126a83 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -49,6 +49,9 @@
 # the dist codename; default: auto
 # dist_codename=Illyria
 
+# the OS branding; default: auto
+# dist_name
+
 # the branding; default: auto
 # dist_branding="MJRO"
 
@@ -62,6 +65,36 @@
 # gpg key; leave empty or commented to skip sfs signing
 # gpgkey=""
 
+########## calamares preferences ##########
+#See branding.desc.d for reference
+
+# welcome style for calamares: true="Welcome to the %1 installer." ; false="Welcome to the Calamares installer for %1." (default)
+# welcomestyle=false
+
+# welcome image scaled (productWelcome) 
+# welcomelogo=true
+
+# size and expansion policy for Calamares (possible value: normal,fullscreen,noexpand)
+# windowexp=noexpand
+
+# size of Calamares window, expressed as w,h. 
+# (possible units: pixel (px) or font-units (em))
+# windowsize="800px,520px"
+
+# colors for text and background components:
+
+# background of the sidebar
+# sidebarbackground=#454948
+
+# text color
+# sidebartext=#efefef
+
+# background of the selected step
+# sidebartextselect=#4d915e
+
+# text color of the selected step
+# sidebartexthighlight=#1a1c1b
+
 ################ deployiso ################
 
 # the server user
diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 2d6f2da..4e09b17 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -96,32 +96,9 @@ configure_lsb(){
 }
 
 configure_branding(){
+
     msg2 "Configuring branding"
-    echo "---
-componentName:  manjaro
-
-strings:
-    productName:         Manjaro Linux
-    shortProductName:    Manjaro
-    version:             ${dist_release}
-    shortVersion:        ${dist_release}
-    versionedName:       Manjaro Linux ${dist_release} "${dist_codename}"
-    shortVersionedName:  Manjaro ${dist_release}
-    bootloaderEntryName: Manjaro
-
-images:
-    productLogo:         "logo.png"
-    productIcon:         "logo.png"
-    productWelcome:      "languages.png"
-
-slideshow:               "show.qml"
-
-style:
-   sidebarBackground:    "#454948"
-   sidebarText:          "#efefef"
-   sidebarTextSelect:    "#9E4F5D"
-
-" > $1/usr/share/calamares/branding/manjaro/branding.desc
+	cat /etc/manjaro-tools/branding.desc.d > $1/usr/share/calamares/branding/manjaro/branding.desc
 }
 
 configure_logind(){
diff --git a/lib/util.sh b/lib/util.sh
index db72b66..b4aae58 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -333,6 +333,26 @@ init_buildiso(){
     mhwd_repo="/opt/pkg"
 }
 
+init_calamares(){
+	
+	[[ -z ${welcomestyle} ]] && welcomestyle=false
+	
+	[[ -z ${welcomelogo} ]] && welcomelogo=true
+	
+	[[ -z ${windowexp} ]] && windowexp=noexpand
+	
+	[[ -z ${windowsize} ]] && windowsize="800px,520px"
+	
+	[[ -z ${sidebarbackground} ]] && sidebarbackground=#454948
+	
+	[[ -z ${sidebartext} ]] &&  sidebartext=#efefef
+	
+	[[ -z ${sidebartextselect} ]] && sidebartextselect=#4d915e
+	
+	[[ -z ${sidebartexthighlight} ]] && sidebartexthighlight=#1a1c1b
+}
+	
+
 init_deployiso(){
 
     host="osdn.net"
@@ -364,6 +384,8 @@ load_config(){
 
     init_buildiso
 
+	init_calamares	
+	
     init_deployiso
 
     return 0

From c4cb48ddf9883df0820c7d3635bfe620efe21653 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Tue, 22 Jan 2019 22:53:19 -0500
Subject: [PATCH 24/34] Not sure this approach work

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util-iso-image.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 4e09b17..12255b3 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -9,6 +9,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 
+source /etc/manjaro-tools/branding.desc.d
+
 copy_overlay(){
     if [[ -e $1 ]]; then
         msg2 "Copying [%s] ..." "${1##*/}"

From c9784f056aafc00d8f523582f07805d6fd117a22 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Thu, 24 Jan 2019 17:36:31 -0500
Subject: [PATCH 25/34] Correct configure_branding and README.md for the new
 options

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 README.md             | 30 +++++++++++++++
 lib/util-iso-image.sh | 89 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 117 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f317434..d7d31e6 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,36 @@ overriding
 # gpg key; leave empty or commented to skip sfs signing
 # gpgkey=""
 
+########## calamares preferences ##########
+#See branding.desc.d for reference
+
+# welcome style for calamares: true="Welcome to the %1 installer." ; false="Welcome to the Calamares installer for %1." (default)
+# welcomestyle=false
+
+# welcome image scaled (productWelcome) 
+# welcomelogo=true
+
+# size and expansion policy for Calamares (possible value: normal,fullscreen,noexpand)
+# windowexp=noexpand
+
+# size of Calamares window, expressed as w,h. 
+# (possible units: pixel (px) or font-units (em))
+# windowsize="800px,520px"
+
+# colors for text and background components:
+
+# background of the sidebar
+# sidebarbackground=#454948
+
+# text color
+# sidebartext=#efefef
+
+# background of the selected step
+# sidebartextselect=#4d915e
+
+# text color of the selected step
+# sidebartexthighlight=#1a1c1b
+
 ################ deployiso ################
 
 # the server user
diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 12255b3..15c6874 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -98,9 +98,94 @@ configure_lsb(){
 }
 
 configure_branding(){
-
     msg2 "Configuring branding"
-	cat /etc/manjaro-tools/branding.desc.d > $1/usr/share/calamares/branding/manjaro/branding.desc
+    echo "---
+componentName:  manjaro
+
+# This selects between different welcome texts. When false, uses
+# the traditional "Welcome to the %1 installer.", and when true,
+# uses "Welcome to the Calamares installer for %1.". This allows
+# to distinguish this installer from other installers for the
+# same distribution.
+welcomeStyleCalamares:   ${welcomestyle}
+
+# Should the welcome image (productWelcome, below) be scaled
+# up beyond its natural size? If false, the image does not grow
+# with the window but remains the same size throughout (this
+# may have surprising effects on HiDPI monitors).
+welcomeExpandingLogo:   ${welcomelogo}
+
+# Size and expansion policy for Calamares.
+#  - "normal" or unset, expand as needed, use *windowSize*
+#  - "fullscreen", start as large as possible, ignore *windowSize*
+#  - "noexpand", never expand, use *windowSize*
+windowExpanding:    ${windowexp}
+
+# Size of Calamares window, expressed as w,h. Both w and h
+# may be either pixels (suffix px) or font-units (suffix em).
+#   e.g.    "800px,600px"
+#           "60em,480px"
+# This setting is ignored if "fullscreen" is selected for
+# *windowExpanding*, above. If not set, use constants defined
+# in CalamaresUtilsGui, 800x520.
+windowSize: ${windowsize}
+
+# These are strings shown to the user in the user interface.
+# There is no provision for translating them -- since they
+# are names, the string is included as-is.
+#
+# The four Url strings are the Urls used by the buttons in
+# the welcome screen, and are not shown to the user. Clicking
+# on the "Support" button, for instance, opens the link supportUrl.
+# If a Url is empty, the corresponding button is not shown.
+#
+# bootloaderEntryName is how this installation / distro is named
+# in the boot loader (e.g. in the GRUB menu).
+strings:
+    productName:         ${dist_name} Linux
+    shortProductName:    ${dist_name}
+    version:             ${dist_release}
+    shortVersion:        ${dist_release}
+    versionedName:       ${dist_name} Linux ${dist_release} "${dist_codename}"
+    shortVersionedName:  ${dist_name} ${dist_release}
+    bootloaderEntryName: ${dist_name}
+
+# These images are loaded from the branding module directory.
+#
+# productIcon is used as the window icon, and will (usually) be used
+#       by the window manager to represent the application. This image
+#       should be square, and may be displayed by the window manager
+#       as small as 16x16 (but possibly larger).
+# productLogo is used as the logo at the top of the left-hand column
+#       which shows the steps to be taken. The image should be square,
+#       and is displayed at 80x80 pixels (also on HiDPI).
+# productWelcome is shown on the welcome page of the application in
+#       the middle of the window, below the welcome text. It can be
+#       any size and proportion, and will be scaled to fit inside
+#       the window. Use `welcomeExpandingLogo` to make it non-scaled.
+#       Recommended size is 320x150.
+images:
+    productLogo:         "logo.png"
+    productIcon:         "logo.png"
+    productWelcome:      "languages.png"
+
+# The slideshow is displayed during execution steps (e.g. when the
+# installer is actually writing to disk and doing other slow things).
+slideshow:               "show.qml"
+
+# Colors for text and background components.
+#
+#  - sidebarBackground is the background of the sidebar
+#  - sidebarText is the (foreground) text color
+#  - sidebarTextHighlight sets the background of the selected (current) step.
+#    Optional, and defaults to the application palette.
+#  - sidebarSelect is the text color of the selected step.
+#
+style:
+   sidebarBackground:    "${sidebarckground}"
+   sidebarText:          "${sidebartext}"
+   sidebarTextSelect:    "${sidebartextselect}"
+   sidebarTextHighlight: "${sidebartexthighlight}"" > $1/usr/share/calamares/branding/manjaro/branding.desc
 }
 
 configure_logind(){

From bb04a599b68367986e7844a847ac7b2124bc278e Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Thu, 24 Jan 2019 17:45:22 -0500
Subject: [PATCH 26/34] Forgot to delete this line :p

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util-iso-image.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 15c6874..9ff1ca8 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -9,8 +9,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 
-source /etc/manjaro-tools/branding.desc.d
-
 copy_overlay(){
     if [[ -e $1 ]]; then
         msg2 "Copying [%s] ..." "${1##*/}"

From 99534efa3ce2d0e2b102fd7322bf2db3049c3920 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Thu, 24 Jan 2019 18:01:20 -0500
Subject: [PATCH 27/34] Funny how bash script read this bracket

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util-iso-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 9ff1ca8..919ba22 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -160,7 +160,7 @@ strings:
 # productWelcome is shown on the welcome page of the application in
 #       the middle of the window, below the welcome text. It can be
 #       any size and proportion, and will be scaled to fit inside
-#       the window. Use `welcomeExpandingLogo` to make it non-scaled.
+#       the window. Use 'welcomeExpandingLogo' to make it non-scaled.
 #       Recommended size is 320x150.
 images:
     productLogo:         "logo.png"

From d6e7190e41bce5ea01963f735bd426bce09b02bc Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Thu, 24 Jan 2019 20:18:06 -0500
Subject: [PATCH 28/34] Typo error

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util-iso-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 919ba22..fa5f27a 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -180,7 +180,7 @@ slideshow:               "show.qml"
 #  - sidebarSelect is the text color of the selected step.
 #
 style:
-   sidebarBackground:    "${sidebarckground}"
+   sidebarBackground:    "${sidebarbackground}"
    sidebarText:          "${sidebartext}"
    sidebarTextSelect:    "${sidebartextselect}"
    sidebarTextHighlight: "${sidebartexthighlight}"" > $1/usr/share/calamares/branding/manjaro/branding.desc

From b6d9ee34b5618a1544412efddac7742c3993a3e8 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Sat, 6 Apr 2019 18:06:51 +0200
Subject: [PATCH 29/34] Fix double quote issue with yaml format

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util-iso-image.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index fa5f27a..5a18b4c 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -101,8 +101,8 @@ configure_branding(){
 componentName:  manjaro
 
 # This selects between different welcome texts. When false, uses
-# the traditional "Welcome to the %1 installer.", and when true,
-# uses "Welcome to the Calamares installer for %1.". This allows
+# the traditional 'Welcome to the %1 installer.', and when true,
+# uses 'Welcome to the Calamares installer for %1.'. This allows
 # to distinguish this installer from other installers for the
 # same distribution.
 welcomeStyleCalamares:   ${welcomestyle}
@@ -144,7 +144,7 @@ strings:
     shortProductName:    ${dist_name}
     version:             ${dist_release}
     shortVersion:        ${dist_release}
-    versionedName:       ${dist_name} Linux ${dist_release} "${dist_codename}"
+    versionedName:       ${dist_name} Linux ${dist_release} "\"${dist_codename}"\"
     shortVersionedName:  ${dist_name} ${dist_release}
     bootloaderEntryName: ${dist_name}
 
@@ -180,10 +180,10 @@ slideshow:               "show.qml"
 #  - sidebarSelect is the text color of the selected step.
 #
 style:
-   sidebarBackground:    "${sidebarbackground}"
-   sidebarText:          "${sidebartext}"
-   sidebarTextSelect:    "${sidebartextselect}"
-   sidebarTextHighlight: "${sidebartexthighlight}"" > $1/usr/share/calamares/branding/manjaro/branding.desc
+   sidebarBackground:    "\"${sidebarbackground}"\"
+   sidebarText:          "\"${sidebartext}"\"
+   sidebarTextSelect:    "\"${sidebartextselect}"\"
+   sidebarTextHighlight: "\"${sidebartexthighlight}"\"" > $1/usr/share/calamares/branding/manjaro/branding.desc
 }
 
 configure_logind(){

From ba88b2ba63549560f4c1d4b0742087254cc02453 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Sun, 28 Apr 2019 12:33:41 +0200
Subject: [PATCH 30/34] Make manjaro-tools compatible with rufus and others

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 lib/util-iso-boot.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh
index 2057eda..e4e8862 100644
--- a/lib/util-iso-boot.sh
+++ b/lib/util-iso-boot.sh
@@ -58,7 +58,7 @@ prepare_grub(){
 
     msg2 "Building %s ..." "${img}"
 
-    grub-mkimage -d ${grub}/${platform} -o ${grub}/${platform}/${img} -O ${platform} -p ${prefix} biosdisk iso9660
+    grub-mkimage -d ${grub}/${platform} -o ${grub}/${platform}/${img} -O ${platform} -p ${prefix} biosdisk iso9660 part_msdos part_gpt fat ntfs
 
     cat ${grub}/${platform}/cdboot.img ${grub}/${platform}/${img} > ${grub}/${platform}/eltorito.img
 
@@ -80,7 +80,7 @@ prepare_grub(){
 
     msg2 "Building %s ..." "${img}"
 
-    grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
+    grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660 part_msdos part_gpt fat ntfs
 
     prepare_dir ${grub}/themes
     cp -r ${data_live}/themes/${iso_name}-live ${grub}/themes/
@@ -98,6 +98,6 @@ prepare_grub(){
     mount_img "${efi_img}" "${mnt}"
     prepare_dir ${mnt}/efi/boot
     msg2 "Building %s ..." "${img}"
-    grub-mkimage -d ${grub}/${platform} -o ${mnt}/efi/boot/${img} -O ${platform} -p ${prefix} iso9660
+    grub-mkimage -d ${grub}/${platform} -o ${mnt}/efi/boot/${img} -O ${platform} -p ${prefix} iso9660 part_msdos part_gpt fat ntfs
     umount_img "${mnt}"
 }

From 3645f17c8fc3215c3dc288a1da640b0d23d686de Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Fri, 3 May 2019 22:23:21 +0200
Subject: [PATCH 31/34] Add grub prefix in live mode

---
 lib/util-iso-boot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh
index e4e8862..f785f61 100644
--- a/lib/util-iso-boot.sh
+++ b/lib/util-iso-boot.sh
@@ -47,7 +47,7 @@ prepare_boot_extras(){
 
 prepare_grub(){
     local platform=i386-pc img='core.img' grub=$2/boot/grub efi=$2/efi/boot \
-        data_live=$1/usr/share/grub lib=usr/lib/grub prefix=/boot/grub data=/usr/share/grub \
+        data_live=$1/usr/share/grub lib=usr/lib/grub prefix=(hd0)/boot/grub data=/usr/share/grub \
         path="${work_dir}/rootfs"
 
     prepare_dir ${grub}/${platform}

From b1e5a54f4b9abfea4d2b94722db0a3da00d5dc95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Wed, 8 May 2019 09:24:19 +0200
Subject: [PATCH 32/34] Revert changes made to prefix.

---
 lib/util-iso-boot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh
index f785f61..e4e8862 100644
--- a/lib/util-iso-boot.sh
+++ b/lib/util-iso-boot.sh
@@ -47,7 +47,7 @@ prepare_boot_extras(){
 
 prepare_grub(){
     local platform=i386-pc img='core.img' grub=$2/boot/grub efi=$2/efi/boot \
-        data_live=$1/usr/share/grub lib=usr/lib/grub prefix=(hd0)/boot/grub data=/usr/share/grub \
+        data_live=$1/usr/share/grub lib=usr/lib/grub prefix=/boot/grub data=/usr/share/grub \
         path="${work_dir}/rootfs"
 
     prepare_dir ${grub}/${platform}

From cc80c4c1a85362af3246da6a0ed6b1cc6427cdb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Thu, 9 May 2019 06:44:28 +0200
Subject: [PATCH 33/34] Remove additional modules: part_msdos part_gpt fat ntfs

---
 lib/util-iso-boot.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh
index e4e8862..2057eda 100644
--- a/lib/util-iso-boot.sh
+++ b/lib/util-iso-boot.sh
@@ -58,7 +58,7 @@ prepare_grub(){
 
     msg2 "Building %s ..." "${img}"
 
-    grub-mkimage -d ${grub}/${platform} -o ${grub}/${platform}/${img} -O ${platform} -p ${prefix} biosdisk iso9660 part_msdos part_gpt fat ntfs
+    grub-mkimage -d ${grub}/${platform} -o ${grub}/${platform}/${img} -O ${platform} -p ${prefix} biosdisk iso9660
 
     cat ${grub}/${platform}/cdboot.img ${grub}/${platform}/${img} > ${grub}/${platform}/eltorito.img
 
@@ -80,7 +80,7 @@ prepare_grub(){
 
     msg2 "Building %s ..." "${img}"
 
-    grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660 part_msdos part_gpt fat ntfs
+    grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
 
     prepare_dir ${grub}/themes
     cp -r ${data_live}/themes/${iso_name}-live ${grub}/themes/
@@ -98,6 +98,6 @@ prepare_grub(){
     mount_img "${efi_img}" "${mnt}"
     prepare_dir ${mnt}/efi/boot
     msg2 "Building %s ..." "${img}"
-    grub-mkimage -d ${grub}/${platform} -o ${mnt}/efi/boot/${img} -O ${platform} -p ${prefix} iso9660 part_msdos part_gpt fat ntfs
+    grub-mkimage -d ${grub}/${platform} -o ${mnt}/efi/boot/${img} -O ${platform} -p ${prefix} iso9660
     umount_img "${mnt}"
 }

From 9f16f6ee83a2065bad318e2df0ed7bb281ad6312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Thu, 23 May 2019 20:27:08 +0200
Subject: [PATCH 34/34] [util-iso-image] add option to disable network drivers

---
 lib/util-iso-image.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 5a18b4c..12ab44d 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -85,6 +85,22 @@ configure_mhwd_drivers(){
         mkdir -p $drv_path/virtualbox/
         echo "" > $drv_path/virtualbox/MHWDCONFIG
     fi
+    local drv_path=$1/var/lib/mhwd/db/pci/network_drivers
+    if  [ -z "$(ls $path | grep broadcom-wl 2> /dev/null)" ]; then
+        msg2 "Disabling broadcom-wl driver"
+        mkdir -p $drv_path/broadcom-wl/
+        echo "" > $drv_path/broadcom-wl/MHWDCONFIG
+    fi
+    if  [ -z "$(ls $path | grep rt3562sta 2> /dev/null)" ]; then
+        msg2 "Disabling rt3562sta driver"
+        mkdir -p $drv_path/rt3562sta/
+        echo "" > $drv_path/rt3562sta/MHWDCONFIG
+    fi
+    if  [ -z "$(ls $path | grep r8168 2> /dev/null)" ]; then
+        msg2 "Disabling r8168 driver"
+        mkdir -p $drv_path/r8168/
+        echo "" > $drv_path/r8168/MHWDCONFIG
+    fi
 }
 
 configure_lsb(){