Fix log directory path on OSX

This commit is contained in:
Ryan Huffman 2016-01-18 15:19:48 -08:00
parent ee1abdf3a1
commit 2ec6dc9ca5
2 changed files with 9 additions and 12 deletions

View file

@ -24,11 +24,12 @@
"packager": "node packager.js"
},
"dependencies": {
"always-tail": "0.2.0",
"extend": "^3.0.0",
"yargs": "^3.30.0",
"os-homedir": "^1.0.1",
"request": "2.67.0",
"request-progress": "1.0.2",
"always-tail": "0.2.0",
"unzip": "0.1.11"
"unzip": "0.1.11",
"yargs": "^3.30.0"
}
}

View file

@ -18,6 +18,7 @@ const unzip = require('unzip');
const request = require('request');
const progress = require('request-progress');
const osHomeDir = require('os-homedir');
const Config = require('./modules/config').Config;
@ -34,19 +35,14 @@ const appIcon = path.join(__dirname, '../resources/console.png');
function getRootHifiDataDirectory() {
if (osType == 'Windows_NT') {
var homePath = process.env.HOMEPATH;
return path.resolve(path.join(homePath, 'AppData/Roaming/High Fidelity'));
return path.resolve(osHomeDir(), 'AppData/Roaming/High Fidelity');
} else if (osType == 'Darwin') {
return path.resolve('~/Library/Application Support/High Fidelity');
return path.resolve(osHomeDir(), 'Library/Application Support/High Fidelity');
} else {
return path.resolve('~/.local/share/High Fidelity');
return path.resolve(osHomeDir(), '.local/share/High Fidelity');
}
}
function getStackManagerDataDirectory() {
// return path.join(getRootHifiDataDirectory(), '../../Local/High Fidelity');
}
function getAssignmentClientResourcesDirectory() {
return path.join(getRootHifiDataDirectory(), '/assignment-client/resources');
}
@ -109,7 +105,7 @@ function shutdown() {
var logPath = path.join(getApplicationDataDirectory(), '/logs');
console.log("Log directory:", logPath);
console.log("Log directory:", logPath, getRootHifiDataDirectory());
const configPath = path.join(getApplicationDataDirectory(), 'config.json');
var userConfig = new Config();