Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-22 01:20:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup

Browse source
This commit is contained in:
Roxanne Skelly 2018-09-27 13:36:10 -07:00
commit ec4575f587
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server-console/src/modules/path-finder.js
View file

@ -1,5 +1,6 @@
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
const { app } = require('electron');
function platformExtension(name) { function platformExtension(name) {
if (name == "Interface") { if (name == "Interface") {
@ -53,12 +54,9 @@ exports.searchPaths = function(name, binaryType, releaseType) {
var componentsPath = appPath + "/Contents/MacOS/Components.app/Contents/MacOS/"; var componentsPath = appPath + "/Contents/MacOS/Components.app/Contents/MacOS/";
paths.push(componentsPath + name + extension); paths.push(componentsPath + name + extension);
// check beside the app bundle for the binaries
paths.push(path.join(path.dirname(appPath), name + extension));
// check in the peer bundle for the binaries
paths.push(path.join("..", name + extension));
} }
// check beside the app bundle for the binaries
paths.push(path.join(path.dirname(app.getAppPath()), "../../..", name + extension));
} }
} }