From 1a2a03519b7258ee9c3683f43422cb53daeec81f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 9 Nov 2016 21:52:49 +0000 Subject: scripts/mkimage.sh: fix checksum generation in outdir --- scripts/mkimage.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/mkimage.sh b/scripts/mkimage.sh index 8110982b03..50d067fa54 100644 --- a/scripts/mkimage.sh +++ b/scripts/mkimage.sh @@ -142,6 +142,7 @@ build_profile() { # Defaults [ -n "$image_name" ] || image_name="alpine-${PROFILE}" [ -n "$output_filename" ] || output_filename="${image_name}-${RELEASE}-${ARCH}.${image_ext}" + local output_file="${OUTDIR:-.}/$output_filename" # Construct final image local _imgid=$(echo -n $_my_sections | sort | checksum) @@ -161,14 +162,14 @@ build_profile() { fi fi - if [ "$_dirty" = "yes" -o ! -e "$output_filename" ]; then + if [ "$_dirty" = "yes" -o ! -e "$output_file" ]; then # Create image output_format="${image_ext//[:\.]/}" create_image_${output_format} || { _fail="yes"; false; } if [ "$_checksum" = "yes" ]; then for _c in $all_checksums; do - ${_c}sum "$output_filename" > "${output_filename}.${_c}" + ${_c}sum "$output_file" > "${output_file}.${_c}" done fi fi -- cgit v1.2.3