From 0861056a4b5588c5a8541faf33d214172a14683a Mon Sep 17 00:00:00 2001 From: Nate Fischer Date: Fri, 4 Mar 2016 18:32:53 -0800 Subject: [PATCH] refactor(cd): use process.env.OLDPWD to store previous dir --- src/cd.js | 6 +++--- src/common.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cd.js b/src/cd.js index 51bc057..95de954 100644 --- a/src/cd.js +++ b/src/cd.js @@ -10,16 +10,16 @@ function _cd(options, dir) { dir = common.getUserHome(); if (dir === '-') { - if (!common.state.previousDir) + if (!process.env.OLDPWD) common.error('could not find previous directory'); else - dir = common.state.previousDir; + dir = process.env.OLDPWD; } try { var curDir = process.cwd(); process.chdir(dir); - common.state.previousDir = curDir; + process.env.OLDPWD = curDir; } catch (e) { // something went wrong, let's figure out the error var err; diff --git a/src/common.js b/src/common.js index 1ac42f4..9270181 100644 --- a/src/common.js +++ b/src/common.js @@ -21,11 +21,12 @@ exports.config = config; var state = { error: null, currentCmd: 'shell.js', - previousDir: null, tempDir: null }; exports.state = state; +process.env.OLDPWD = null; // initially, there's no previous directory + var platform = os.type().match(/^Win/) ? 'win' : 'unix'; exports.platform = platform;