Skip to content

Commit

Permalink
Adjust diff-pr.sh to no longer tolerate "bashbrew cat" failures (sinc…
Browse files Browse the repository at this point in the history
…e we handle "new" and "deleted" images as special cases now)
  • Loading branch information
tianon committed Dec 3, 2020
1 parent f5a2897 commit 5eaf242
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions diff-pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,11 @@ for img; do touch "$BASHBREW_LIBRARY/$img"; [ -s "$BASHBREW_LIBRARY/$img" ] || e
bashbrew list "$@" 2>>temp/_bashbrew.err | sort -uV > temp/_bashbrew-list || :
"$diffDir/_bashbrew-cat-sorted.sh" "$@" 2>>temp/_bashbrew.err > temp/_bashbrew-cat || :
for image; do
if script="$(bashbrew cat --format "$template" "$image")"; then
mkdir tar
( eval "$script" | tar -xiC tar )
copy-tar tar temp
rm -rf tar
fi
script="$(bashbrew cat --format "$template" "$image")"
mkdir tar
( eval "$script" | tar -xiC tar )
copy-tar tar temp
rm -rf tar
done
git -C temp add . || :
git -C temp commit --quiet --allow-empty -m 'initial' || :
Expand Down

0 comments on commit 5eaf242

Please sign in to comment.