From 565c931e2c684d4460ff65cbec9b097ee1d8f94d Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Thu, 18 Dec 2014 23:20:22 -0500 Subject: updpkgsums: add more error checking before replacement Re-add some paranoia which was inadvertently lost with 768b65e934. In case 'makepkg -g' fails to generate new sums (e.g. when a remote resource cannot be fetched), or awk fails to write the new file (i have no idea when this would happen), bail out with an error. Signed-off-by: Allan McRae --- contrib/updpkgsums.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index a40845b6..b0d2d69e 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -86,7 +86,7 @@ newbuildfile=$(mktemp --tmpdir updpkgsums.XXXXXX) # $newbuildfile as garbage in $TMPDIR. This fails silently if the replacement # succeeds. trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT -newsums=$(makepkg -g -p "$buildfile") && +newsums=$(makepkg -g -p "$buildfile") || die 'Failed to generate new checksums' awk -v newsums="$newsums" ' /^[[:blank:]]*(md|sha)[[:digit:]]+sums(_[^=]+)?=/,/\)[[:blank:]]*(#.*)?$/ { if (!w) { @@ -98,7 +98,7 @@ awk -v newsums="$newsums" ' 1 END { if (!w) print newsums } -' "$buildfile" > "$newbuildfile" +' "$buildfile" > "$newbuildfile" || die 'Failed to write new PKGBUILD' # Replace the original buildfile. if ! mv -- "$newbuildfile" "$buildfile"; then -- cgit v1.2.3-24-g4f1b