diff options
| author | Erik Arvstedt <erik.arvstedt@gmail.com> | 2022-07-02 16:12:16 +0200 |
|---|---|---|
| committer | Erik Arvstedt <erik.arvstedt@gmail.com> | 2022-07-02 16:12:51 +0200 |
| commit | bb7867f1e5080de1dfff80e2f7d5a4be49889e23 (patch) | |
| tree | cea62ee346fff327d1fc535d3d87aa43880c0955 /pkgs/applications/editors/vscode | |
| parent | 958c79dc11acf5b07b7e6ca40ae7e96565034788 (diff) | |
| download | nixlib-bb7867f1e5080de1dfff80e2f7d5a4be49889e23.tar nixlib-bb7867f1e5080de1dfff80e2f7d5a4be49889e23.tar.gz nixlib-bb7867f1e5080de1dfff80e2f7d5a4be49889e23.tar.bz2 nixlib-bb7867f1e5080de1dfff80e2f7d5a4be49889e23.tar.lz nixlib-bb7867f1e5080de1dfff80e2f7d5a4be49889e23.tar.xz nixlib-bb7867f1e5080de1dfff80e2f7d5a4be49889e23.tar.zst nixlib-bb7867f1e5080de1dfff80e2f7d5a4be49889e23.zip | |
vscode: simplify helper scripts
This simplifies the following commit. - Remove `--` from `rm` because `$tmpDir` is guaranteed to never start with a `-`. We also don't use this pattern when removing tmpDirs at other places in nixpkgs. - Remove `unset tmpDir` because the variable `tmpDir` is never accessed after the exit handler is run.
Diffstat (limited to 'pkgs/applications/editors/vscode')
| -rwxr-xr-x | pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh | 5 | ||||
| -rwxr-xr-x | pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh | 4 |
2 files changed, 3 insertions, 6 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..6a8968024c88 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,9 +37,8 @@ prefetchExtensionUnpacked() { 1>&2 echo "zipStorePath='$zipStorePath'" function rm_tmpdir() { - 1>&2 printf "rm -rf -- %q\n" "$tmpDir" - rm -rf -- "$tmpDir" - unset tmpDir + 1>&2 printf "rm -rf %q\n" "$tmpDir" + rm -rf "$tmpDir" trap - INT TERM HUP EXIT } function make_trapped_tmpdir() { diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh b/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh index 00ef77553242..3c1d68de79cd 100755 --- a/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh +++ b/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh @@ -44,9 +44,7 @@ extStoreName="${extPublisher}-${extName}" function rm_tmpdir() { - #echo "Removing \`tmpDir='$tmpDir'\`" - rm -rf -- "$tmpDir" - unset tmpDir + rm -rf "$tmpDir" trap - INT TERM HUP EXIT } function make_trapped_tmpdir() { |