From 123ad11541bb8f60bd208a4552ec34ffcb624f46 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Tue, 30 Aug 2016 19:48:02 +0200
Subject: [PATCH 01/12] [util-*] use given primary group of user in chown cmd -
 don't assume that the primary group of a user is named the same as the user
 itself - fixes #248

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

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index cf97246..aafddd0 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -749,7 +749,7 @@ load_profile(){
 	iso_dir="${cache_dir_iso}/${edition}/${dist_release}/${profile}"
 
 	prepare_dir "${iso_dir}"
-	chown "${OWNER}:${OWNER}" "${iso_dir}"
+	chown "${OWNER}:$(id --group ${OWNER})" "${iso_dir}"
 
 	mktorrent_args=(-v -p -l ${piece_size} -a ${tracker_url} -w $(gen_webseed))
 }

From 61c33cebcdb08c625c369f3c89799efd53e76752 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Sat, 27 Aug 2016 11:54:50 +0200
Subject: [PATCH 02/12] upd gitignore

---
 .gitignore |  1 +
 .project   | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 .project

diff --git a/.gitignore b/.gitignore
index abbf807..ee5376d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.tar.xz
 .kateproject.d
 data/misc
+-project
diff --git a/.project b/.project
deleted file mode 100644
index 17bab97..0000000
--- a/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>manjaro-tools</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

From e7e09aa1bdb026da5589b89ee5f7c0bd48963cb0 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Sat, 3 Sep 2016 10:46:50 +0200
Subject: [PATCH 03/12] util-iso-cal: prepare to use plymouthcfg module

---
 lib/util-iso-calamares.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index ffec758..c327eae 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -237,6 +237,7 @@ write_settings_conf(){
 	fi
 	echo "  - grubcfg" >> "$conf"
 	echo "  - bootloader" >> "$conf"
+	echo "  - plymouthcfg" >> "$conf"
 	echo "  - postcfg" >> "$conf"
 	echo "  - umount" >> "$conf"
 	echo "- show:" >> "$conf"
@@ -346,10 +347,13 @@ write_grubcfg_conf(){
 	echo "    GRUB_DISABLE_SUBMENU: true" >> "$conf"
 	echo '    GRUB_TERMINAL_OUTPUT: "console"' >> "$conf"
 	echo "    GRUB_DISABLE_RECOVERY: true" >> "$conf"
-	if ${plymouth_boot};then
-		echo '' >> "$conf"
-		echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
-	fi
+}
+
+write_plymouthcfg_conf(){
+	local conf="$1/etc/calamares/modules/plymouthcfg.conf"
+	msg2 "Writing %s ..." "${conf##*/}"
+	echo "---" > "$conf"
+    echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
 }
 
 configure_calamares(){
@@ -379,6 +383,8 @@ configure_calamares(){
 
 	${netinstall} && write_netinstall_conf "$1"
 
+	${plymouth_boot} && write_plymouthcfg_conf "$1"
+
 	write_chrootcfg_conf "$1"
 
 	write_postcfg_conf "$1"

From e791d9b24f631e32c3d3a14e1d8e87fd9e116c46 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sun, 4 Sep 2016 18:08:18 +0200
Subject: [PATCH 04/12] [plymouth] configure has to be happen with boot-image -
 see also: https://bugs.manjaro.org/index.php?do=details&task_id=30 -
 configuration via CAL still missing

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

diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 94a2542..079a1be 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -237,7 +237,6 @@ configure_live_image(){
 	msg "Configuring [live-image]"
 	detect_desktop_env "$1"
 	configure_hosts "$1"
-	configure_plymouth "$1"
 	configure_lsb "$1"
 	configure_mhwd "$1"
 	configure_system "$1"
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index aafddd0..56af27b 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -320,6 +320,7 @@ make_image_boot() {
 		mkdir -p ${path}
 
 		mount_image_select "${path}"
+		configure_plymouth "${path}"
 
 		copy_initcpio "${profile_dir}" "${path}"
 

From 2dfa49889656d5558aa4d9a67b2c685aeaf76732 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sun, 4 Sep 2016 18:19:39 +0200
Subject: [PATCH 05/12] [plymouth] plymouthcfg detects and need to be before
 initcpiocfg

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

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index c327eae..e1cb120 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -224,6 +224,7 @@ write_settings_conf(){
 	echo "  - localecfg" >> "$conf"
 	echo "  - luksopenswaphookcfg" >> "$conf"
 	echo "  - luksbootkeyfile" >> "$conf"
+	echo "  - plymouthcfg" >> "$conf"
 	echo "  - initcpiocfg" >> "$conf"
 	echo "  - initcpio" >> "$conf"
 	echo "  - users" >> "$conf"
@@ -237,7 +238,6 @@ write_settings_conf(){
 	fi
 	echo "  - grubcfg" >> "$conf"
 	echo "  - bootloader" >> "$conf"
-	echo "  - plymouthcfg" >> "$conf"
 	echo "  - postcfg" >> "$conf"
 	echo "  - umount" >> "$conf"
 	echo "- show:" >> "$conf"

From b3ad9bbd20a82fb275634261a3bedfc8adfdc7b6 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sun, 4 Sep 2016 19:18:12 +0200
Subject: [PATCH 06/12] [.gitignore] update

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ee5376d..60f64a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 *.tar.xz
 .kateproject.d
 data/misc
--project
+.project

From e1f325f1de57b51978835ba56b7209e3a573b846 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sun, 4 Sep 2016 19:21:46 +0200
Subject: [PATCH 07/12] [util-iso-cal] fix alignment

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

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index e1cb120..5b1369d 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -353,7 +353,7 @@ write_plymouthcfg_conf(){
 	local conf="$1/etc/calamares/modules/plymouthcfg.conf"
 	msg2 "Writing %s ..." "${conf##*/}"
 	echo "---" > "$conf"
-    echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
+	echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
 }
 
 configure_calamares(){

From 2494e9f46fa6df8f0249abcbdf3915fc9d88ebb1 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Mon, 5 Sep 2016 18:45:44 +0200
Subject: [PATCH 08/12] util-iso-cal: write locale.conf

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

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 5b1369d..f34bf2a 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -356,6 +356,16 @@ write_plymouthcfg_conf(){
 	echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
 }
 
+write_locale_conf(){
+	local conf="$1/etc/calamares/modules/locale.conf"
+	msg2 "Writing %s ..." "${conf##*/}"
+	echo "---" > "$conf"
+	echo "region: America" >> "$conf"
+	echo "zone: New_York" >> "$conf"
+	echo "localeGenPath: /etc/locale.gen" >> "$conf"
+	echo "geoipUrl: freegeoip.net" >> "$conf"
+}
+
 configure_calamares(){
 	info "Configuring [Calamares]"
 
@@ -363,6 +373,8 @@ configure_calamares(){
 
 	write_settings_conf "$1"
 
+	write_locale_conf "$1"
+
 	write_welcome_conf "$1"
 
 	write_packages_conf "$1"

From 8d4e9cda6f75bd187d72482006ed840a4ffadde0 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Fri, 9 Sep 2016 14:33:09 +0200
Subject: [PATCH 09/12] [util] fix if or syntax

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

diff --git a/lib/util.sh b/lib/util.sh
index 07f4833..c3145c1 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -377,8 +377,7 @@ check_profile_vars(){
 
 get_svc(){
 	local service=${displaymanager}
-	if  [[ $service != "sddm" ]] || \
-		[[ $service != "lxdm" ]];then
+	if  [[ $service != "sddm" || $service != "lxdm" ]];then
 		${plymouth_boot} && service="$service-plymouth"
 	fi
 	echo $service

From de7f4cd200a6d9c51c935196124d7655575ced9e Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Fri, 9 Sep 2016 14:54:26 +0200
Subject: [PATCH 10/12] [util] use case instead to fix plymouth services

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

diff --git a/lib/util.sh b/lib/util.sh
index c3145c1..e235309 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -377,9 +377,10 @@ check_profile_vars(){
 
 get_svc(){
 	local service=${displaymanager}
-	if  [[ $service != "sddm" || $service != "lxdm" ]];then
-		${plymouth_boot} && service="$service-plymouth"
-	fi
+	case $service in
+		'sddm'|'lxdm') service="$service" ;;
+		*) ${plymouth_boot} && service="$service-plymouth" ;;
+	esac
 	echo $service
 }
 

From ea205bce99c7e7d02672dd991d94c697f2db6c51 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Sat, 10 Sep 2016 15:27:33 +0200
Subject: [PATCH 11/12] update readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 021101a..73c29b9 100644
--- a/README.md
+++ b/README.md
@@ -98,10 +98,10 @@ overriding
 # dist_name="Manjaro"
 
 # the dist release; default: auto
-# dist_release=16.06
+# dist_release=16.10
 
 # the codename; defaults to value sourced from /etc/lsb-release
-# dist_codename="Daniella"
+# dist_codename="Fringilla"
 
 # the branding; default: auto
 # dist_branding="MJRO"

From 8585bcbd865bdc01d283c6064013b1f1dadd1a4b Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Sat, 10 Sep 2016 20:31:14 +0200
Subject: [PATCH 12/12] util-iso-cal: only write plmouthcfg in settings.conf if
 plymouth_boot

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

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index f34bf2a..29ed068 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -224,7 +224,7 @@ write_settings_conf(){
 	echo "  - localecfg" >> "$conf"
 	echo "  - luksopenswaphookcfg" >> "$conf"
 	echo "  - luksbootkeyfile" >> "$conf"
-	echo "  - plymouthcfg" >> "$conf"
+	${plymouth_boot} && echo "  - plymouthcfg" >> "$conf"
 	echo "  - initcpiocfg" >> "$conf"
 	echo "  - initcpio" >> "$conf"
 	echo "  - users" >> "$conf"