From 41eb0a2fd03c0342481fc8eb694630ec6dc19330 Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Tue, 24 Jun 2025 12:33:35 +0200 Subject: [PATCH] build_tools/update_translations.fish: protect against universally-set $tmpdir --- build_tools/update_translations.fish | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build_tools/update_translations.fish b/build_tools/update_translations.fish index c5ba81fe5..f6eda9ed1 100755 --- a/build_tools/update_translations.fish +++ b/build_tools/update_translations.fish @@ -83,12 +83,12 @@ if set -l --query _flag_only_mo end # Protect from externally set $tmpdir leaking into this script. -set -g --erase tmpdir +set -g tmpdir function cleanup_exit set -l exit_status $status - if set -g --query tmpdir + if set -g --query tmpdir[1] rm -r $tmpdir end @@ -117,7 +117,7 @@ if set -l --query _flag_dry_run end for po_file in $po_files - if set -g --query tmpdir + if set --query tmpdir[1] set po_file $tmpdir/(basename $po_file) end if set -l --query po @@ -139,8 +139,7 @@ end rm $template_file -if set -g --query tmpdir - rm $tmpdir/template.po +if set --query tmpdir[1] diff -ur $po_dir $tmpdir or cleanup_exit end