From a018a08c5b6d406eb51588a53f599103bb55b1a0 Mon Sep 17 00:00:00 2001 From: RkEclair Date: Thu, 24 Jan 2019 22:32:48 +0900 Subject: [PATCH] Fix #58 bug --- setCwd.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/setCwd.js b/setCwd.js index 3dced73..869eb5a 100644 --- a/setCwd.js +++ b/setCwd.js @@ -3,15 +3,14 @@ const { promisify } = require('util'); const promiseExec = promisify(exec); -const setCwd = async ({ dispatch, action, tab }) => { - const newCwd = await promiseExec( - `lsof -p ${tab.pid} | grep cwd | tr -s ' ' | cut -d ' ' -f9-`); - // Since Node v8, return type of a promisified exec has changed: - // https://github.com/nodejs/node/commit/fe5ca3ff27 - const cwd = typeof newCwd === 'string' ? newCwd.trim() : newCwd.stdout.trim(); - dispatch({ - type: 'SESSION_SET_CWD', - cwd, +const setCwd = ({dispatch, action, tab}) => { + return promiseExec( + `LANG=en_US.utf-8 lsof -n -p ${ + tab.pid + } | grep cwd | tr -s ' ' | cut -d ' ' -f9-` + ).then((newCwd) => { + const cwd = (newCwd.stdout || newCwd).trim(); + dispatch({type: "SESSION_SET_CWD", cwd}); }); };