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

tweak -q settings; cleaning

Browse source
This commit is contained in:
udeved 2017-02-16 10:24:38 +01:00
parent c642392ceb
commit 22da95c0c6
4 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bin/buildiso.in
View file

@ -21,12 +21,8 @@ import ${LIBDIR}/util.sh
show_profile(){
prepare_profile "$1"
msg2 "pacman_conf: %s" "${pacman_conf}"
msg2 "iso_file: %s" "${iso_file}"
if ${verbose};then
msg2 "work_dir: %s" "${work_dir}"
msg2 "iso_root: %s" "${iso_root}"
msg2 "iso_dir: %s" "${iso_dir}"
msg2 "iso_file: %s" "${iso_file}"
msg2 "autologin: %s" "${autologin}"
msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
msg2 "pxe_boot: %s" "${pxe_boot}"
@ -69,17 +65,13 @@ display_settings(){
show_config
msg "PROFILE:"
msg2 "list_dir_iso: %s" "${list_dir_iso}"
msg2 "build_lists: %s" "$(show_build_lists ${list_dir_iso})"
msg2 "build_list_iso: %s" "${build_list_iso}"
msg2 "is_build_list: %s" "${is_build_list}"
msg2 "build_mirror: %s" "${build_mirror}/${target_branch}"
${verbose} && msg2 "run_dir: %s" "${run_dir}"
msg "OPTIONS:"
msg2 "arch: %s" "${target_arch}"
msg2 "branch: %s" "${target_branch}"
msg2 "chroots_iso: %s" "${chroots_iso}"
msg2 "initsys: %s" "${initsys}"
msg2 "kernel: %s" "${kernel}"
[[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
@ -95,10 +87,9 @@ display_settings(){
msg2 "dist_release: %s" "${dist_release}"
msg2 "dist_codename: %s" "${dist_codename}"
msg "ISO SETTINGS:"
msg "ISO INFO:"
msg2 "iso_label: %s" "${iso_label}"
msg2 "use_overlayfs: %s" "${use_overlayfs}"
${verbose} && msg2 "iso_fs: %s" "${iso_fs}"
msg2 "iso_fs: %s" "${iso_fs}"
msg "BUILD QUEUE:"
run show_profile "${build_list_iso}"

5
bin/buildpkg.in
View file

@ -37,13 +37,9 @@ display_settings(){
show_config
msg "PROFILE:"
msg2 "list_dir_pkg: %s" "${list_dir_pkg}"
msg2 "build_lists: %s" "$(show_build_lists ${list_dir_pkg})"
msg2 "build_list_pkg: %s" "${build_list_pkg}"
msg2 "is_build_list: %s" "${is_build_list}"
msg2 "build_mirror: %s" "${build_mirror}/${target_branch}"
# msg2 "make_conf_dir: %s" "${make_conf_dir}"
# msg2 "build_profiles: %s" "$(show_build_profiles ${make_conf_dir})"
msg "OPTIONS:"
msg2 "arch: %s" "${target_arch}"
@ -59,7 +55,6 @@ display_settings(){
msg2 "udev_root: %s" "${udev_root}"
msg "PATHS:"
msg2 "work_dir: %s" "${work_dir}"
msg2 "pkg_dir: %s" "${pkg_dir}"
if ${clean_first};then

1
bin/check-yaml.in
View file

@ -66,7 +66,6 @@ display_settings(){
show_config
msg "PROFILE:"
msg2 "list_dir_iso: %s" "${list_dir_iso}"
msg2 "build_lists: %s" "$(show_build_lists ${list_dir_iso})"
msg2 "build_list_iso: %s" "${build_list_iso}"
msg2 "is_build_list: %s" "${is_build_list}"

5
lib/util.sh
View file

@ -298,10 +298,10 @@ init_buildiso(){
dist_name=$(get_distname)
[[ -z ${dist_branding} ]] && dist_branding="MJRO"
iso_name=$(get_osid)
[[ -z ${dist_branding} ]] && dist_branding="MJRO"
iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")
[[ -z ${initsys} ]] && initsys="systemd"
@ -739,7 +739,6 @@ show_config(){
else
msg2 "manjaro_tools_conf: %s" "${manjaro_tools_conf}"
fi
msg2 "log_dir: %s" "${log_dir}"
}
# $1: chroot