Commit 499da2d
tools: use mktemp to create the workspace directory
On some platforms, the TMPDIR environment variable is not set.
PR-URL: #38432
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent 0e446d6 commit 499da2d
1 file changed
Lines changed: 9 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,16 +11,17 @@ if [ "$#" -le 0 ]; then | |||
| 11 | 11 | exit 1 | |
| 12 | 12 | fi | |
| 13 | 13 | ||
| 14 | - WORKSPACE="$TMPDIR"update-npm-$NPM_VERSION/ | ||
| 14 | + echo "Making temporary workspace" | ||
| 15 | 15 | ||
| 16 | - if [ -d "$WORKSPACE" ]; then | ||
| 17 | - echo "Cleaning up old workspace" | ||
| 18 | - rm -rf "$WORKSPACE" | ||
| 19 | - fi | ||
| 16 | + WORKSPACE=$(mktemp -d 2> /dev/null || mktemp -d -t 'tmp') | ||
| 20 | 17 | ||
| 21 | - echo "Making temporary workspace" | ||
| 18 | + cleanup () { | ||
| 19 | + EXIT_CODE=$? | ||
| 20 | + [ -d "$WORKSPACE" ] && rm -rf "$WORKSPACE" | ||
| 21 | + exit $EXIT_CODE | ||
| 22 | + } | ||
| 22 | 23 | ||
| 23 | - mkdir -p "$WORKSPACE" | ||
| 24 | + trap cleanup INT TERM EXIT | ||
| 24 | 25 | ||
| 25 | 26 | cd "$WORKSPACE" | |
| 26 | 27 | ||
@@ -39,11 +40,7 @@ rm -rf npm/ | |||
| 39 | 40 | ||
| 40 | 41 | echo "Copying new npm" | |
| 41 | 42 | ||
| 42 | - tar zxf "$WORKSPACE"cli/release/npm-"$NPM_VERSION".tgz | ||
| 43 | - | ||
| 44 | - echo "Deleting temporary workspace" | ||
| 45 | - | ||
| 46 | - rm -rf "$WORKSPACE" | ||
| 43 | + tar zxf "$WORKSPACE"/cli/release/npm-"$NPM_VERSION".tgz | ||
| 47 | 44 | ||
| 48 | 45 | echo "" | |
| 49 | 46 | echo "All done!" | |
0 commit comments