From 9897e30ea75a55184399eb345502171fe78a5a93 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Tue, 7 Jul 2015 22:11:10 +0200
Subject: [PATCH 1/4] [util-iso-calamares] make branding support more flexible

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

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 637f4ad..eb4ea16 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -117,18 +117,15 @@ write_calamares_users_conf(){
 brand_calamares_settings_conf(){
 	local conf="$1/usr/share/calamares/settings.conf"
 
-	if [[ ${iso_name} == 'manjaro' ]];then
-		local branding="$1/usr/share/calamares/branding/${iso_name}-${custom}"
-		if [[ -d $branding ]];then
-			sed -i -e "s|branding: manjaro|branding: ${iso_name}-${custom}|g" "$conf"
-		fi
+	local branding="$1/usr/share/calamares/branding/${iso_name}-${custom}"
+	if [[ -d $branding ]];then
+		sed -i -e "s|^.*branding:.*|branding: ${iso_name}-${custom}|" "$conf"
 	else
 		local branding="$1/usr/share/calamares/branding/${iso_name}"
 		if [[ -d $branding ]];then
-			sed -i -e "s|branding: manjaro|branding: ${iso_name}|g" "$conf"
+			sed -i -e "s|^.*branding:.*|branding: ${iso_name}-${custom}|" "$conf"
 		fi
 	fi
-
 }
 
 configure_calamares(){

From 1f0e0b96655a49a474db40836caa436d72de43a4 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Tue, 7 Jul 2015 22:12:35 +0200
Subject: [PATCH 2/4] [util-iso-calamares] remove empty line

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

diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index eb4ea16..ff40e83 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -116,7 +116,6 @@ write_calamares_users_conf(){
 
 brand_calamares_settings_conf(){
 	local conf="$1/usr/share/calamares/settings.conf"
-
 	local branding="$1/usr/share/calamares/branding/${iso_name}-${custom}"
 	if [[ -d $branding ]];then
 		sed -i -e "s|^.*branding:.*|branding: ${iso_name}-${custom}|" "$conf"

From 219d33f5a76740440dcb2a1b88c857c0fdbf52b4 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Tue, 7 Jul 2015 22:16:59 +0200
Subject: [PATCH 3/4] [util-iso-calamares] make branding support more flexible
 (proper)

---
 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 ff40e83..73b86d2 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -122,7 +122,7 @@ brand_calamares_settings_conf(){
 	else
 		local branding="$1/usr/share/calamares/branding/${iso_name}"
 		if [[ -d $branding ]];then
-			sed -i -e "s|^.*branding:.*|branding: ${iso_name}-${custom}|" "$conf"
+			sed -i -e "s|^.*branding:.*|branding: ${iso_name}|" "$conf"
 		fi
 	fi
 }

From 6bfe4d9f03eb5d240b26d0ee3b952a71df80a7c4 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Wed, 8 Jul 2015 19:49:05 +0200
Subject: [PATCH 4/4] [util-iso] add req #122

---
 lib/util-iso.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index d1a4dbf..5374bd8 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -246,7 +246,12 @@ make_image_custom() {
 		fi
 
 		pacman -Qr "${path}" > "${path}/${custom}-image-pkgs.txt"
-		cp "${path}/${custom}-image-pkgs.txt" ${cache_dir_iso}/${iso_name}-${custom}-${dist_release}-${arch}-pkgs.txt
+		if [[ ${initsys} == 'openrc' ]];then
+			local pkgs_file="${iso_name}-${custom}-${initsys}-${dist_release}-${arch}-pkgs.txt"
+		else
+			local pkgs_file="${iso_name}-${custom}-${dist_release}-${arch}-pkgs.txt"
+		fi
+		cp "${path}/${custom}-image-pkgs.txt" ${cache_dir_iso}/${pkgs_file}
 		[[ -d ${custom}-overlay ]] && copy_overlay_custom
 		configure_custom_image "${path}"
 		${is_custom_pac_conf} && clean_pacman_conf "${path}"