From 186e996becc5e7bf156340103d0aeefea4908956 Mon Sep 17 00:00:00 2001 From: Omar Crespo Date: Sun, 5 May 2019 03:11:25 -0400 Subject: [PATCH 1/2] Detect yarn in Solus os --- packages/@vue/cli-shared-utils/lib/env.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/@vue/cli-shared-utils/lib/env.js b/packages/@vue/cli-shared-utils/lib/env.js index 7e3eef15e0..f1fb2d4e95 100644 --- a/packages/@vue/cli-shared-utils/lib/env.js +++ b/packages/@vue/cli-shared-utils/lib/env.js @@ -27,8 +27,15 @@ exports.hasYarn = () => { execSync('yarnpkg --version', { stdio: 'ignore' }) return (_hasYarn = true) } catch (e) { - return (_hasYarn = false) + _hasYarn = false } + try { + execSync('yarn --version', { stdio: 'ignore' }) + return (_hasYarn = true) + } catch (e) { + _hasYarn = false + } + return _hasYarn } exports.hasProjectYarn = (cwd) => { From 637d4c13462e0572dff0c3f01782fdf304412fbc Mon Sep 17 00:00:00 2001 From: Omar Crespo Date: Wed, 26 Jun 2019 07:48:20 -0400 Subject: [PATCH 2/2] Apply suggestions from code review suggest from @pksunkara Co-Authored-By: Pavan Kumar Sunkara --- packages/@vue/cli-shared-utils/lib/env.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/@vue/cli-shared-utils/lib/env.js b/packages/@vue/cli-shared-utils/lib/env.js index f1fb2d4e95..68bea5026e 100644 --- a/packages/@vue/cli-shared-utils/lib/env.js +++ b/packages/@vue/cli-shared-utils/lib/env.js @@ -27,15 +27,13 @@ exports.hasYarn = () => { execSync('yarnpkg --version', { stdio: 'ignore' }) return (_hasYarn = true) } catch (e) { - _hasYarn = false } try { execSync('yarn --version', { stdio: 'ignore' }) return (_hasYarn = true) } catch (e) { - _hasYarn = false + return (_hasYarn = false) } - return _hasYarn } exports.hasProjectYarn = (cwd) => {