diff options
| author | Sebastián Mancilla <238528+smancill@users.noreply.github.com> | 2022-08-14 21:42:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-14 21:42:41 -0400 |
| commit | 10a745eac8641d6d08c75dadd0a4736f87c63248 (patch) | |
| tree | 4eead16aedfa866796c08f53b80fefaa24d649aa /pkgs/applications/editors/vscode | |
| parent | 5917c179d6aa3ca3f2bfabb83cbe761fd0103f75 (diff) | |
| parent | 3f54dfa4755613dbd3098814a9ab07cb977ca347 (diff) | |
| download | nixlib-10a745eac8641d6d08c75dadd0a4736f87c63248.tar nixlib-10a745eac8641d6d08c75dadd0a4736f87c63248.tar.gz nixlib-10a745eac8641d6d08c75dadd0a4736f87c63248.tar.bz2 nixlib-10a745eac8641d6d08c75dadd0a4736f87c63248.tar.lz nixlib-10a745eac8641d6d08c75dadd0a4736f87c63248.tar.xz nixlib-10a745eac8641d6d08c75dadd0a4736f87c63248.tar.zst nixlib-10a745eac8641d6d08c75dadd0a4736f87c63248.zip | |
Merge pull request #179896 from erikarvstedt/fix-bash-exit-handler
treewide: fix bash exit handlers
Diffstat (limited to 'pkgs/applications/editors/vscode')
| -rwxr-xr-x | pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh | 8 | ||||
| -rwxr-xr-x | pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh b/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh index e3d1e5fb1397..4b0ca54da362 100755 --- a/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh +++ b/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" - rm -rf -- "$tmpDir" - unset tmpDir - trap - INT TERM HUP EXIT + 1>&2 printf "rm -rf %q\n" "$tmpDir" + rm -rf "$tmpDir" } function make_trapped_tmpdir() { tmpDir=$(mktemp -d) - trap rm_tmpdir INT TERM HUP EXIT + trap rm_tmpdir EXIT } 1>&2 echo diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh b/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh index 00ef77553242..d7bd307c92a0 100755 --- a/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh +++ b/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" - unset tmpDir - trap - INT TERM HUP EXIT + rm -rf "$tmpDir" } function make_trapped_tmpdir() { tmpDir=$(mktemp -d) - trap rm_tmpdir INT TERM HUP EXIT + trap rm_tmpdir EXIT } echo |