mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

vscode: simplify helper scripts

Browse source 
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.
This commit is contained in:
Erik Arvstedt 2022-07-02 16:12:16 +02:00
parent 958c79dc11
commit bb7867f1e5
No known key found for this signature in database
GPG key ID: 33312B944DD97846
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,9 +37,8 @@ prefetchExtensionUnpacked() {
1>&2 echo "zipStorePath='$zipStorePath'" 1>&2 echo "zipStorePath='$zipStorePath'"
function rm_tmpdir() { 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 trap - INT TERM HUP EXIT
} }
function make_trapped_tmpdir() { function make_trapped_tmpdir() {

4
pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh
View file

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