diff --git a/bin/buildiso.in b/bin/buildiso.in index 54d95e5..aedeb66 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -21,6 +21,7 @@ import ${LIBDIR}/util.sh show_profile(){ prepare_profile "$1" msg2 "iso_file: %s" "${iso_file}" + msg2 "iso_label: %s" "${iso_label}" if ${verbose}; then msg2 "autologin: %s" "${autologin}" msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}" @@ -84,7 +85,6 @@ display_settings(){ msg2 "dist_codename: %s" "${dist_codename}" msg "ISO INFO:" - msg2 "iso_label: %s" "${iso_label}" msg2 "iso_compression: %s" "${iso_compression}" msg "BUILD QUEUE:" diff --git a/lib/util.sh b/lib/util.sh index 73d1bfc..250c30f 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -244,10 +244,10 @@ init_buildpkg(){ get_iso_label(){ local label="$1" - label="${label//_}" # relace all _ + #label="${label//_}" # relace all _ label="${label//-}" # relace all - - label="${label^^}" # all uppercase - label="${label::8}" # limit to 8 characters + label="${label^^}" # all uppercase + label="${label::32}" # limit to 32 characters echo ${label} } @@ -309,12 +309,10 @@ init_buildiso(){ iso_name=$(get_osid) - [[ -z ${dist_branding} ]] && dist_branding="MJRO" + [[ -z ${dist_branding} ]] && dist_branding="MANJARO" [[ -z ${iso_compression} ]] && iso_compression='zstd' - iso_label=$(get_iso_label "${dist_branding}${dist_release//.}") - [[ -z ${kernel} ]] && kernel="linux54" load_run_dir "${profile_repo}"