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

buildiso: move logging on -v switch #195

Browse source
This commit is contained in:
udeved 2016-05-22 20:02:28 +02:00
parent 7fdb1cba88
commit a66c84ecd8
3 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/buildiso.in
View file

@ -66,7 +66,7 @@ display_settings(){
msg2 "buildset_iso: %s" "${buildset_iso}"
msg2 "is_buildset: %s" "${is_buildset}"
${verbose} && msg2 "run_dir: %s" "${run_dir}"
${is_log} && msg2 "log_dir: %s" "${log_dir}"
${verbose} && msg2 "log_dir: %s" "${log_dir}"
msg2 "pacman_conf: %s" "${pacman_conf}"
msg "OPTIONS:"
@ -81,7 +81,6 @@ display_settings(){
msg2 "images_only: %s" "${images_only}"
msg2 "iso_only: %s" "${iso_only}"
msg2 "sign: %s" "${sign}"
msg2 "is_log: %s" "${is_log}"
msg "DIST SETTINGS:"
msg2 "dist_name: %s" "${dist_name}"
@ -117,7 +116,6 @@ images_only=false
iso_only=false
verbose=false
sign=false
is_log=false
pacman_conf_arch='default'
@ -139,8 +137,7 @@ usage() {
echo ' -x Build images only'
echo ' -z Generate iso only'
echo ' Requires pre built images (-x)'
echo ' -l Log the build process'
echo ' -v Verbose output, show profies detail (-q)'
echo ' -v Verbose output to log file, show profile detail (-q)'
echo ' -q Query settings and pretend build'
echo ' -h This help'
echo ''
@ -150,7 +147,7 @@ usage() {
orig_argv=("$@")
opts='p:a:b:r:t:k:i:clzxsvqh'
opts='p:a:b:r:t:k:i:czxsvqh'
while getopts "${opts}" arg; do
case "${arg}" in
@ -165,7 +162,6 @@ while getopts "${opts}" arg; do
c) clean_first=false ;;
x) images_only=true ;;
z) iso_only=true ;;
l) is_log=true ;;
v) verbose=true ;;
q) pretend=true ;;
h|?) usage 0 ;;

7
docbook/buildiso.xml
View file

@ -127,11 +127,6 @@
<listitem><para>Disable clean working directory step.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-l</option></term>
<listitem><para>Log the build process.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-x</option></term>
@ -148,7 +143,7 @@
<varlistentry>
<term><option>-v</option></term>
<listitem><para>Verbose output, show profile detail in combination with pretend.</para></listitem>
<listitem><para>Verbose output to log file, show profile detail in combination with pretend.</para></listitem>
</varlistentry>
<varlistentry>

6
lib/util-iso.sh
View file

@ -48,7 +48,7 @@ run_safe() {
restoretrap=$(trap -p ERR)
trap 'error_function $func' ERR SIGINT SIGTERM
if ${is_log};then
if ${verbose};then
run_log "$func"
else
"$func"
@ -90,14 +90,14 @@ make_sqfs() {
if [[ "$name" == "mhwd-image" && ${used_kernel} < "4" ]]; then
mksqfs_args+=(-comp lz4)
if ${is_log};then
if ${verbose};then
mksquashfs "${mksqfs_args[@]}" >/dev/null
else
mksquashfs "${mksqfs_args[@]}"
fi
else
mksqfs_args+=(-comp ${iso_compression} ${highcomp})
if ${is_log};then
if ${verbose};then
mksquashfs "${mksqfs_args[@]}" >/dev/null
else
mksquashfs "${mksqfs_args[@]}"