nixos-rebuild: fix double trap

zimbatm · zimbatm · commit eafa9cfce5c8 · 2023-03-29T16:17:29.000+02:00
Only one callback can be installed per signal in Bash. Because the
previous `trap` removes the whole temporary workdir, the one around the
SSH key is redundant.
diff --git a/terraform/nixos-rebuild/deploy.sh b/terraform/nixos-rebuild/deploy.sh
@@ -21,7 +21,6 @@ sshOpts+=(-o StrictHostKeyChecking=no)
 
 if [[ -n ${SSH_KEY+x} && ${SSH_KEY} != "-" ]]; then
   sshPrivateKeyFile="$workDir/ssh_key"
-  trap 'rm "$sshPrivateKeyFile"' EXIT
   # Create the file with 0700 - umask calculation: 777 - 700 = 077
   (
     umask 077

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ sshOpts+=(-o StrictHostKeyChecking=no)`
`21`	`21`
`22`	`22`	`if [[ -n ${SSH_KEY+x} && ${SSH_KEY} != "-" ]]; then`
`23`	`23`	`sshPrivateKeyFile="$workDir/ssh_key"`
`24`		`- trap 'rm "$sshPrivateKeyFile"' EXIT`
`25`	`24`	`# Create the file with 0700 - umask calculation: 777 - 700 = 077`
`26`	`25`	`(`
`27`	`26`	`umask 077`