Commit 08ba08e8 authored by Stefano Capitani's avatar Stefano Capitani

Fix calamares branding

Signed-off-by: Stefano Capitani's avatarSte74 <stefano@manjaro.org>
parent 8d140615
......@@ -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(){
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment