Browse Source

os: remove trailing slash from os.tmpdir()

This commit makes `os.tmpdir()` behave consistently on all platforms. It
changes `os.tmpdir()` to always return a path without trailing slash.

Semver: major
Fixes: https://github.com/iojs/io.js/issues/715
PR-URL: https://github.com/iojs/io.js/pull/747
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
v2.0.2
Christian Tellnes 10 years ago
committed by Chris Dickinson
parent
commit
b57cc51d8d
  1. 8
      lib/os.js
  2. 4
      test/parallel/test-os.js

8
lib/os.js

@ -23,16 +23,20 @@ exports.platform = function() {
}; };
exports.tmpdir = function() { exports.tmpdir = function() {
var path;
if (isWindows) { if (isWindows) {
return process.env.TEMP || path = process.env.TEMP ||
process.env.TMP || process.env.TMP ||
(process.env.SystemRoot || process.env.windir) + '\\temp'; (process.env.SystemRoot || process.env.windir) + '\\temp';
} else { } else {
return process.env.TMPDIR || path = process.env.TMPDIR ||
process.env.TMP || process.env.TMP ||
process.env.TEMP || process.env.TEMP ||
'/tmp'; '/tmp';
} }
if (/[\\\/]$/.test(path))
path = path.slice(0, -1);
return path;
}; };
exports.tmpDir = exports.tmpdir; exports.tmpDir = exports.tmpdir;

4
test/parallel/test-os.js

@ -13,6 +13,8 @@ if (process.platform === 'win32') {
process.env.TMP = ''; process.env.TMP = '';
var expected = (process.env.SystemRoot || process.env.windir) + '\\temp'; var expected = (process.env.SystemRoot || process.env.windir) + '\\temp';
assert.equal(os.tmpdir(), expected); assert.equal(os.tmpdir(), expected);
process.env.TEMP = '\\temp\\';
assert.equal(os.tmpdir(), '\\temp');
} else { } else {
assert.equal(os.tmpdir(), '/tmpdir'); assert.equal(os.tmpdir(), '/tmpdir');
process.env.TMPDIR = ''; process.env.TMPDIR = '';
@ -21,6 +23,8 @@ if (process.platform === 'win32') {
assert.equal(os.tmpdir(), '/temp'); assert.equal(os.tmpdir(), '/temp');
process.env.TEMP = ''; process.env.TEMP = '';
assert.equal(os.tmpdir(), '/tmp'); assert.equal(os.tmpdir(), '/tmp');
process.env.TMPDIR = '/tmpdir/';
assert.equal(os.tmpdir(), '/tmpdir');
} }
var endianness = os.endianness(); var endianness = os.endianness();

Loading…
Cancel
Save