deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-18 13:35:10 +02:00
Code Issues 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
parent ba397c158a c870545b46
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) {
// First off, try to find yarn inside of The Lounge
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 yarn = require.resolve("yarn/bin/yarn.js");
const packagesPath = Helper.getPackagesPath();
const cachePath = path.join(packagesPath, "package_manager_cache");