Merge pull request #179896 from erikarvstedt/fix-bash-exit-handler

treewide: fix bash exit handlers

maintainers/scripts/rebuild-amount.sh

@@ -35,7 +35,7 @@ toRemove=()
 cleanup() {
     rm -rf "${toRemove[@]}"
 }
-trap cleanup EXIT SIGINT SIGQUIT ERR
+trap cleanup EXIT
 
 MKTEMP='mktemp --tmpdir nix-rebuild-amount-XXXXXXXX'
 

nixos/modules/services/backup/borgbackup.nix

@@ -23,12 +23,10 @@ let
     on_exit()
     {
       exitStatus=$?
-      # Reset the EXIT handler, or else we're called again on 'exit' below
-      trap - EXIT
       ${cfg.postHook}
       exit $exitStatus
     }
-    trap 'on_exit' INT TERM QUIT EXIT
+    trap on_exit EXIT
 
     archiveName="${if cfg.archiveBaseName == null then "" else cfg.archiveBaseName + "-"}$(date ${cfg.dateFormat})"
     archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}"

nixos/modules/services/web-apps/keycloak.nix

@@ -562,7 +562,7 @@ in
             shopt -s inherit_errexit
 
             create_role="$(mktemp)"
-            trap 'rm -f "$create_role"' ERR EXIT
+            trap 'rm -f "$create_role"' EXIT
 
             db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")"
             echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" > "$create_role"

pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh

@@ -37,14 +37,12 @@ prefetchExtensionUnpacked() {
   1>&2 echo "zipStorePath='$zipStorePath'"
 
   function rm_tmpdir() {
-    1>&2 printf "rm -rf -- %q\n" "$tmpDir"
+    1>&2 printf "rm -rf %q\n" "$tmpDir"
-    rm -rf -- "$tmpDir"
+    rm -rf "$tmpDir"
-    unset tmpDir
-    trap - INT TERM HUP EXIT
   }
   function make_trapped_tmpdir() {
     tmpDir=$(mktemp -d)
-    trap rm_tmpdir INT TERM HUP EXIT
+    trap rm_tmpdir EXIT
   }
 
   1>&2 echo

pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh

@@ -44,14 +44,11 @@ extStoreName="${extPublisher}-${extName}"
 
 
 function rm_tmpdir() {
-  #echo "Removing \`tmpDir='$tmpDir'\`"
+  rm -rf "$tmpDir"
-  rm -rf -- "$tmpDir"
-  unset tmpDir
-  trap - INT TERM HUP EXIT
 }
 function make_trapped_tmpdir() {
   tmpDir=$(mktemp -d)
-  trap rm_tmpdir INT TERM HUP EXIT
+  trap rm_tmpdir EXIT
 }
 
 echo

pkgs/build-support/fetchcvs/nix-prefetch-cvs

@@ -21,13 +21,11 @@ fi
 
 mkTempDir() {
     tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-cvs-XXXXXXXX")"
-    trap removeTempDir EXIT SIGINT SIGQUIT
+    trap removeTempDir EXIT
 }
 
 removeTempDir() {
-    if test -n "$tmpPath"; then
+    rm -rf "$tmpPath"
-        rm -rf "$tmpPath" || true
-    fi
 }