From 6fd044ccba49ec7871f478b1c47c0b76d004b96a Mon Sep 17 00:00:00 2001 From: Joe Lim Date: Mon, 6 Nov 2017 00:46:21 -0800 Subject: [PATCH 1/2] improve eject message --- packages/react-scripts/scripts/eject.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/react-scripts/scripts/eject.js b/packages/react-scripts/scripts/eject.js index 2b859694fce..076ab906c86 100644 --- a/packages/react-scripts/scripts/eject.js +++ b/packages/react-scripts/scripts/eject.js @@ -28,7 +28,7 @@ const cyan = chalk.cyan; function getGitStatus() { try { - let stdout = execSync(`git status --porcelain`, { + let stdout = execSync(`git status --porcelain | awk '{print $2}'`, { stdio: ['pipe', 'pipe', 'ignore'], }).toString(); return stdout.trim(); @@ -54,11 +54,14 @@ inquirer if (gitStatus) { console.error( chalk.red( - `This git repository has untracked files or uncommitted changes:\n\n` + - gitStatus.split('\n').map(line => ' ' + line) + - '\n\n' + + 'This git repository has untracked files or uncommitted changes:' + ) + + '\n\n' + + gitStatus + + '\n\n' + + chalk.red( 'Remove untracked files, stash or commit any changes, and try again.' - ) + ) ); process.exit(1); } From 70e036e5314d0e52253ebc05bef0bce59f606f17 Mon Sep 17 00:00:00 2001 From: Joe Lim Date: Tue, 7 Nov 2017 08:13:57 -0800 Subject: [PATCH 2/2] cross os implementation --- packages/react-scripts/scripts/eject.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/react-scripts/scripts/eject.js b/packages/react-scripts/scripts/eject.js index 076ab906c86..c8438f5d156 100644 --- a/packages/react-scripts/scripts/eject.js +++ b/packages/react-scripts/scripts/eject.js @@ -28,7 +28,7 @@ const cyan = chalk.cyan; function getGitStatus() { try { - let stdout = execSync(`git status --porcelain | awk '{print $2}'`, { + let stdout = execSync(`git status --porcelain`, { stdio: ['pipe', 'pipe', 'ignore'], }).toString(); return stdout.trim(); @@ -57,7 +57,10 @@ inquirer 'This git repository has untracked files or uncommitted changes:' ) + '\n\n' + - gitStatus + + gitStatus + .split('\n') + .map(line => line.match(/ .*/g)[0].trim()) + .join('\n') + '\n\n' + chalk.red( 'Remove untracked files, stash or commit any changes, and try again.'