supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2993 from thelounge/xpaw/require-resolve-yarn

Browse Source 
Use require.resolve for yarn
This commit is contained in:
Pavel Djundik 2019-01-28 00:56:19 +02:00 committed by GitHub
commit 03c4fc58a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/command-line/utils.js
View File

@ -108,25 +108,7 @@ class Utils {
} }
static executeYarnCommand(command, ...parameters) { static executeYarnCommand(command, ...parameters) {
// First off, try to find yarn inside of The Lounge const yarn = require.resolve("yarn/bin/yarn.js");
let yarn = path.join(
__dirname, "..", "..", "node_modules",
"yarn", "bin", "yarn.js"
);
if (!fs.existsSync(yarn)) {
// Now try to find yarn in the same parent folder as The Lounge (flat install)
yarn = path.join(
__dirname, "..", "..", "..",
"yarn", "bin", "yarn.js"
);
if (!fs.existsSync(yarn)) {
// Fallback to global installation
yarn = "yarn";
}
}
const packagesPath = Helper.getPackagesPath(); const packagesPath = Helper.getPackagesPath();
const cachePath = path.join(packagesPath, "package_manager_cache"); const cachePath = path.join(packagesPath, "package_manager_cache");