From 08ba08e846f5a47b7f0d2a713924cf5cea7d16d1 Mon Sep 17 00:00:00 2001 From: Ste74 Date: Tue, 18 Dec 2018 21:13:25 -0500 Subject: [PATCH] Fix calamares branding Signed-off-by: Ste74 --- 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