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

[buildiso] add a verbose option

Browse source
This commit is contained in:
udeved 2015-05-22 12:40:11 +02:00 committed by Ramon Buldó
parent f57504dd0b
commit 87e46dfb97
1 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
bin/buildiso.in
View file

@ -23,29 +23,31 @@ SYSCONFDIR='@sysconfdir@'
show_profile(){ show_profile(){
cd $1 cd $1
load_profile "$1" load_profile "$1"
msg2 "work_dir: ${work_dir}" if ${verbose};then
msg2 "iso_file: ${iso_file}" msg2 "work_dir: ${work_dir}"
msg2 "is_custom_pac_conf: ${is_custom_pac_conf}" msg2 "iso_file: ${iso_file}"
msg2 "is_custom_pac_conf: ${is_custom_pac_conf}"
msg2 "initsys: ${initsys}" msg2 "initsys: ${initsys}"
msg2 "displaymanager: ${displaymanager}" msg2 "displaymanager: ${displaymanager}"
msg2 "kernel: ${kernel}" msg2 "kernel: ${kernel}"
msg2 "efi_boot_loader: ${efi_boot_loader}" msg2 "efi_boot_loader: ${efi_boot_loader}"
msg2 "efi_part_size: ${efi_part_size}" msg2 "efi_part_size: ${efi_part_size}"
${is_plymouth} && msg2 "plymouth_theme: ${plymouth_theme}" ${is_plymouth} && msg2 "plymouth_theme: ${plymouth_theme}"
msg2 "hostname: ${hostname}" msg2 "hostname: ${hostname}"
msg2 "username: ${username}" msg2 "username: ${username}"
msg2 "password: ${password}" msg2 "password: ${password}"
msg2 "addgroups: ${addgroups}" msg2 "addgroups: ${addgroups}"
if [[ ${initsys} == 'systemd' ]];then if [[ ${initsys} == 'systemd' ]];then
msg2 "start_systemd: ${start_systemd[*]}" msg2 "start_systemd: ${start_systemd[*]}"
msg2 "start_systemd_live: ${start_systemd_live[*]}" msg2 "start_systemd_live: ${start_systemd_live[*]}"
else else
msg2 "start_openrc: ${start_openrc[*]}" msg2 "start_openrc: ${start_openrc[*]}"
msg2 "start_openrc_live: ${start_openrc_live[*]}" msg2 "start_openrc_live: ${start_openrc_live[*]}"
fi
fi fi
cd .. cd ..
} }
@ -102,13 +104,13 @@ display_settings(){
msg2 "dist_codename: ${dist_codename}" msg2 "dist_codename: ${dist_codename}"
msg2 "dist_version: ${dist_version}" msg2 "dist_version: ${dist_version}"
msg "ISO SETTINGS:" msg "ISO SETTINGS:"
msg2 "iso_label: ${iso_label}" msg2 "iso_label: ${iso_label}"
msg2 "iso_name: ${iso_name}" msg2 "iso_name: ${iso_name}"
msg2 "iso_publisher: ${iso_publisher}" msg2 "iso_publisher: ${iso_publisher}"
msg2 "iso_app_id: ${iso_app_id}" msg2 "iso_app_id: ${iso_app_id}"
msg2 "iso_compression: ${iso_compression}" msg2 "iso_compression: ${iso_compression}"
msg2 "iso_checksum: ${iso_checksum}" msg2 "iso_checksum: ${iso_checksum}"
msg "BUILD QUEUE:" msg "BUILD QUEUE:"
show_build_queue show_build_queue
@ -127,6 +129,9 @@ clean_cache_lng=false
pretend=false pretend=false
images_only=false images_only=false
iso_only=false iso_only=false
verbose=true
verbose_args=''
pacman_conf_arch='default' pacman_conf_arch='default'
@ -143,6 +148,7 @@ usage() {
echo ' -i Build images only' echo ' -i Build images only'
echo ' -s Generate iso only' echo ' -s Generate iso only'
echo ' Requires pre built images (-i)' echo ' Requires pre built images (-i)'
echo ' -v Disable verbose output'
echo ' -q Query settings and pretend build' echo ' -q Query settings and pretend build'
echo ' -h This help' echo ' -h This help'
echo '' echo ''
@ -152,7 +158,7 @@ usage() {
orig_argv=("$@") orig_argv=("$@")
opts='p:a:b:r:cxlisqh' opts='p:a:b:r:cxlisvqh'
while getopts "${opts}" arg; do while getopts "${opts}" arg; do
case "${arg}" in case "${arg}" in
@ -166,6 +172,7 @@ while getopts "${opts}" arg; do
l) clean_cache_lng=true ;; l) clean_cache_lng=true ;;
i) images_only=true ;; i) images_only=true ;;
s) iso_only=true ;; s) iso_only=true ;;
v) verbose=false; verbose_args='&> /dev/null' ;;
q) pretend=true ;; q) pretend=true ;;
h|?) usage 0 ;; h|?) usage 0 ;;
*) echo "invalid argument '${arg}'"; usage 1 ;; *) echo "invalid argument '${arg}'"; usage 1 ;;
@ -188,8 +195,6 @@ mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf"
check_root "$0" "${orig_argv[@]}" check_root "$0" "${orig_argv[@]}"
#check_run_dir
eval_buildset "${buildset_iso}" "${sets_dir_iso}" eval_buildset "${buildset_iso}" "${sets_dir_iso}"
prepare_cachedirs prepare_cachedirs