github/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

paths: rewrite to support several paths for one browser

Browse Source
This commit is contained in:
CanadaHonk 2022-12-28 13:08:59 +00:00
parent 9cae53f26b
commit 1b3f76d47a
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/index.js
View File

@ -51,32 +51,30 @@ const exists = async path => {
return (await getBinariesInPath()).includes(path); return (await getBinariesInPath()).includes(path);
}; };
const getBrowserPath = async browser => {
for (const path of Array.isArray(browserPaths[browser]) ? browserPaths[browser] : [ browserPaths[browser] ]) {
log('checking if ' + browser + ' exists:', path, await exists(path));
if (await exists(path)) return path;
}
return null;
};
const findBrowserPath = async (forceBrowser) => { const findBrowserPath = async (forceBrowser) => {
if (forceBrowser) return [ browserPaths[forceBrowser], forceBrowser ]; if (forceBrowser) return [ await getBrowserPath(forceBrowser), forceBrowser ];
let whichBrowser = ''; for (const x in browserPaths) {
if (process.argv.includes('--' + x) || process.argv.includes('--' + x.split('_')[0])) return [ await getBrowserPath(x), x ];
for (const x of Object.keys(browserPaths)) {
if (process.argv.includes('--' + x) || process.argv.includes('--' + x.split('_')[0])) {
whichBrowser = x;
break;
}
} }
if (!whichBrowser) { for (const x in browserPaths) {
for (const x in browserPaths) { const path = await getBrowserPath(x);
log('checking if ' + x + ' exists:', browserPaths[x], await exists(browserPaths[x]));
if (await exists(browserPaths[x])) { if (path) return [ path, x ];
whichBrowser = x;
break;
}
}
} }
if (!whichBrowser) return null; return null;
return [ browserPaths[whichBrowser], whichBrowser ];
}; };
const getFriendlyName = whichBrowser => whichBrowser[0].toUpperCase() + whichBrowser.slice(1).replace(/[a-z]_[a-z]/g, _ => _[0] + ' ' + _[2].toUpperCase()); const getFriendlyName = whichBrowser => whichBrowser[0].toUpperCase() + whichBrowser.slice(1).replace(/[a-z]_[a-z]/g, _ => _[0] + ' ' + _[2].toUpperCase());