root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-iso] only edit branding when file exists

Browse source
This commit is contained in:
Philip Müller 2020-02-12 00:21:49 +01:00
parent 05722a2fa2
commit ed9b77b2fe
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/util-iso.sh
View file

@ -347,7 +347,7 @@ make_image_desktop() {
cp "${path}/desktopfs-pkgs.txt" ${iso_dir}/$(gen_iso_fn)-pkgs.txt cp "${path}/desktopfs-pkgs.txt" ${iso_dir}/$(gen_iso_fn)-pkgs.txt
[[ -e ${profile_dir}/desktop-overlay ]] && copy_overlay "${profile_dir}/desktop-overlay" "${path}" [[ -e ${profile_dir}/desktop-overlay ]] && copy_overlay "${profile_dir}/desktop-overlay" "${path}"
if [[ ${profile} != "architect" && ${oem_used} != "false" ]]; then if [[ -e "${path}/usr/share/calamares/branding/manjaro/branding.desc" ]]; then
configure_branding "${path}" configure_branding "${path}"
msg "Done [Distribution: Release ${dist_release} Codename ${dist_codename}]" msg "Done [Distribution: Release ${dist_release} Codename ${dist_codename}]"
fi fi
@ -385,7 +385,7 @@ make_image_live() {
copy_overlay "${profile_dir}/live-overlay" "${path}" copy_overlay "${profile_dir}/live-overlay" "${path}"
configure_live_image "${path}" configure_live_image "${path}"
if [[ ${profile} != "architect" ]]; then if [[ -e "${path}/usr/share/calamares/branding/manjaro/branding.desc" ]]; then
configure_branding "${path}" configure_branding "${path}"
msg "Done [Distribution: Release ${dist_release} Codename ${dist_codename}]" msg "Done [Distribution: Release ${dist_release} Codename ${dist_codename}]"
fi fi
@ -612,6 +612,8 @@ load_profile(){
iso_file=$(gen_iso_fn).iso iso_file=$(gen_iso_fn).iso
iso_label=$(get_iso_label "${dist_branding}_${profile}_${dist_release//.}")
mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}" -K) mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}" -K)
work_dir=${chroots_iso}/${profile}/${target_arch} work_dir=${chroots_iso}/${profile}/${target_arch}