root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

buildiso: don't show mktorrent_args

Browse source
This commit is contained in:
udeved 2016-07-16 20:14:58 +02:00
parent a95d21c63a
commit c9bf20d04c
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/buildiso.in
View file

@ -53,10 +53,9 @@ show_profile(){
msg2 "start_openrc_live: %s" "${start_openrc_live[*]}" msg2 "start_openrc_live: %s" "${start_openrc_live[*]}"
msg2 "disable_openrc: %s" "${disable_openrc[*]}" msg2 "disable_openrc: %s" "${disable_openrc[*]}"
fi fi
if ${is_torrent};then if ${torrent};then
msg2 "tracker_url: %s" "${tracker_url}" msg2 "tracker_url: %s" "${tracker_url}"
msg2 "piece_size: %s" "${piece_size}" msg2 "piece_size: %s" "${piece_size}"
msg2 "mktorrent_args: %s" "${mktorrent_args[*]}"
fi fi
fi fi
reset_profile reset_profile
@ -86,7 +85,7 @@ display_settings(){
msg2 "images_only: %s" "${images_only}" msg2 "images_only: %s" "${images_only}"
msg2 "iso_only: %s" "${iso_only}" msg2 "iso_only: %s" "${iso_only}"
msg2 "sign: %s" "${sign}" msg2 "sign: %s" "${sign}"
msg2 "is_torrent: %s" "${is_torrent}" msg2 "torrent: %s" "${torrent}"
msg "DIST SETTINGS:" msg "DIST SETTINGS:"
msg2 "dist_name: %s" "${dist_name}" msg2 "dist_name: %s" "${dist_name}"
@ -121,7 +120,7 @@ images_only=false
iso_only=false iso_only=false
verbose=false verbose=false
sign=false sign=false
is_torrent=false torrent=false
usage() { usage() {
echo "Usage: ${0##*/} [options]" echo "Usage: ${0##*/} [options]"
@ -167,7 +166,7 @@ while getopts "${opts}" arg; do
c) clean_first=false ;; c) clean_first=false ;;
x) images_only=true ;; x) images_only=true ;;
z) iso_only=true ;; z) iso_only=true ;;
w) is_torrent=true ;; w) torrent=true ;;
v) verbose=true ;; v) verbose=true ;;
q) pretend=true ;; q) pretend=true ;;
h|?) usage 0 ;; h|?) usage 0 ;;

2
lib/util-iso.sh
View file

@ -606,7 +606,7 @@ compress_images(){
run_safe "make_iso" run_safe "make_iso"
make_checksum "${iso_file}" make_checksum "${iso_file}"
${sign} && sign_iso "${iso_file}" ${sign} && sign_iso "${iso_file}"
${is_torrent} && make_torrent ${torrent} && make_torrent
chown -R "${OWNER}:${OWNER}" "${iso_dir}" chown -R "${OWNER}:${OWNER}" "${iso_dir}"
show_elapsed_time "${FUNCNAME}" "${timer}" show_elapsed_time "${FUNCNAME}" "${timer}"
} }