From 015d482ce8394acd2f8bc9da2cd70339ebbcc3f9 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 26 May 2012 17:19:29 -0400 Subject: avoid subshell in adding --quiet to bsdcpio Signed-off-by: Dave Reisner --- mkinitcpio | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index eae27fe..8762991 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -389,18 +389,27 @@ set +o functrace trap -- ERR declare -i status=0 -declare -a pipesave if [[ $GENIMG ]]; then msg "Creating $COMPRESSION initcpio image: %s" "$GENIMG" - [[ $COMPRESSION = xz ]] && COMPRESSION_OPTIONS+=" --check=crc32" + + case $COMPRESSION in + xz) + COMPRESSION_OPTIONS+=' --check=crc32' + ;; + esac + + cpio_opts=('-R' '0:0' '-0' '-o' '-H' 'newc') + if (( QUIET )); then + cpio_opts+=('--quiet') + fi # write version stamp printf '%s' "$version" > "$BUILDROOT/VERSION" pushd "$BUILDROOT" >/dev/null find . -print0 | - bsdcpio $( (( QUIET )) && echo '--quiet' ) -R 0:0 -0oH newc | - $COMPRESSION $COMPRESSION_OPTIONS > "$GENIMG" + bsdcpio "${cpio_opts[@]}" | + $COMPRESSION $COMPRESSION_OPTIONS > "$GENIMG" pipesave=("${PIPESTATUS[@]}") # save immediately popd >/dev/null -- cgit v1.2.3-24-g4f1b