summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoofar <toofar@spalge.com>2023-01-03 17:19:08 +1300
committertoofar <toofar@spalge.com>2023-01-03 19:12:07 +1300
commit6576c03de08d7878f11d5869c119a1767bf3c897 (patch)
tree9d9c555f803af4446ca8e37891b783cf15ab2222
parent355da9a44e4da7ec3a16613d6375234720e34df6 (diff)
downloadqutebrowser-6576c03de08d7878f11d5869c119a1767bf3c897.tar.gz
qutebrowser-6576c03de08d7878f11d5869c119a1767bf3c897.zip
misc fixes
clean up temp files always log the fail reason even if not pausing
-rwxr-xr-xscripts/check_mergability.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/check_mergability.sh b/scripts/check_mergability.sh
index 5d4e6a6fa..5bab9a98c 100755
--- a/scripts/check_mergability.sh
+++ b/scripts/check_mergability.sh
@@ -54,6 +54,7 @@ maybepause () {
elif [ "$DO_PAUSE" = "yes" ] ;then
true
else
+ echo "$1"
return
fi
@@ -169,7 +170,7 @@ generate_report () {
head_sha=$(git rev-parse HEAD)
jq -r '.[] | "\(.number) \(.updatedAt) \(.title)"' < ../prs.json | while read number updated title; do
- [ -n "$pr" ] && [ "$pr" != "$number" ] continue
+ [ -n "$pr" ] && [ "$pr" != "$number" ] && continue
[ -n "$quiet" ] || echo "trying ${prefix}pr/$number $updated $title"
git reset -q --hard $head_sha
@@ -292,7 +293,7 @@ cat > "\$inputf"
# TODO: de-dup these with the parent script?
# Can use aliases here?
-# Call with the file drectly instead of using stdin?
+# Call with the file directly instead of using stdin?
usort () { env usort format -; }
black () { env black -q -; }
isort () { env isort -q -; }
@@ -316,6 +317,7 @@ echo "\$cmds" | tr ' ' '\n' | while read cmd; do
done
cat "\$inputf"
+rm "\$inputf"
EOF
chmod +x filter-tools/filter-cache
export PATH="$PWD/filter-tools:$PATH"