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

[merge] volid branch

Browse source
This commit is contained in:
Philip Müller 2020-02-13 20:15:08 +01:00
commit 5e36d2d206
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/buildiso.in
View file

@ -21,6 +21,7 @@ import ${LIBDIR}/util.sh
show_profile(){ show_profile(){
prepare_profile "$1" prepare_profile "$1"
msg2 "iso_file: %s" "${iso_file}" msg2 "iso_file: %s" "${iso_file}"
msg2 "iso_label: %s" "${iso_label}"
if ${verbose}; then if ${verbose}; then
msg2 "autologin: %s" "${autologin}" msg2 "autologin: %s" "${autologin}"
msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}" msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
@ -84,7 +85,6 @@ display_settings(){
msg2 "dist_codename: %s" "${dist_codename}" msg2 "dist_codename: %s" "${dist_codename}"
msg "ISO INFO:" msg "ISO INFO:"
msg2 "iso_label: %s" "${iso_label}"
msg2 "iso_compression: %s" "${iso_compression}" msg2 "iso_compression: %s" "${iso_compression}"
msg "BUILD QUEUE:" msg "BUILD QUEUE:"

10
lib/util.sh
View file

@ -244,10 +244,10 @@ init_buildpkg(){
get_iso_label(){ get_iso_label(){
local label="$1" local label="$1"
label="${label//_}" # relace all _ #label="${label//_}" # relace all _
label="${label//-}" # relace all - label="${label//-}" # relace all -
label="${label^^}" # all uppercase label="${label^^}" # all uppercase
label="${label::8}" # limit to 8 characters label="${label::32}" # limit to 32 characters
echo ${label} echo ${label}
} }
@ -309,12 +309,10 @@ init_buildiso(){
iso_name=$(get_osid) iso_name=$(get_osid)
[[ -z ${dist_branding} ]] && dist_branding="MJRO" [[ -z ${dist_branding} ]] && dist_branding="MANJARO"
[[ -z ${iso_compression} ]] && iso_compression='zstd' [[ -z ${iso_compression} ]] && iso_compression='zstd'
iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")
[[ -z ${kernel} ]] && kernel="linux54" [[ -z ${kernel} ]] && kernel="linux54"
load_run_dir "${profile_repo}" load_run_dir "${profile_repo}"