icedream
/
ts3bot
mirror of https://github.com/icedream/ts3bot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use os.homedir() and pass through %USERPROFILE%.

develop
Icedream 2017-05-18 01:33:24 +02:00
parent 653dfbef4e
commit 430b64e03b
Signed by: icedream
GPG Key ID: 1573F6D8EFE4D0CF
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config.coffee
View File

@ -2,13 +2,14 @@ import nconf from 'nconf'
import path from 'path' import path from 'path'
import merge from 'merge' import merge from 'merge'
import pwgen from 'password-generator' import pwgen from 'password-generator'
import { homedir } from 'os'
console.log "Loading configuration..." console.log "Loading configuration..."
# Build configuration object from input # Build configuration object from input
nconf.env [ "NODE_ENV", "PULSE_BINARY" ] nconf.env [ "NODE_ENV", "PULSE_BINARY" ]
nconf.argv() nconf.argv()
nconf.file path.join(process.env["HOME"], ".ts3bot", "config.json") nconf.file path.join(homedir(), ".ts3bot", "config.json")
nconf.defaults nconf.defaults
# read http://stackoverflow.com/q/12252043 on why I'm using .trim here # read http://stackoverflow.com/q/12252043 on why I'm using .trim here
"environment": process.env.NODE_ENV?.trim() or "development" "environment": process.env.NODE_ENV?.trim() or "development"
@ -18,7 +19,7 @@ nconf.defaults
"vlc-password": pwgen() "vlc-password": pwgen()
"nickname": "TS3Bot" "nickname": "TS3Bot"
"ts3-install-path": path.resolve __dirname, "..", "ts3client" "ts3-install-path": path.resolve __dirname, "..", "ts3client"
"ts3-config-path": path.join process.env.HOME, ".ts3client" "ts3-config-path": path.join homedir(), ".ts3client"
"xvfb-resolution": "800x600x16" "xvfb-resolution": "800x600x16"
"console-log-level": "info" "console-log-level": "info"
"file-log-level": "debug" "file-log-level": "debug"

2
src/services/pulseaudio.coffee
View File

@ -1,5 +1,6 @@
import { spawn } from 'child_process' import { spawn } from 'child_process'
import StreamSplitter from 'stream-splitter' import StreamSplitter from 'stream-splitter'
import { homedir } from 'os'
import getLogger from '../logger' import getLogger from '../logger'
import services from '../services' import services from '../services'
@ -38,6 +39,7 @@ module.exports = class PulseAudioService extends services.Service
env: env:
DISPLAY: process.env.DISPLAY DISPLAY: process.env.DISPLAY
HOME: process.env.HOME HOME: process.env.HOME
USERPROFILE: process.env.USERPROFILE
XDG_RUNTIME_DIR: process.env.XDG_RUNTIME_DIR XDG_RUNTIME_DIR: process.env.XDG_RUNTIME_DIR
# check if there is already a daemon running # check if there is already a daemon running

1
src/services/ts3client.coffee
View File

@ -86,6 +86,7 @@ module.exports = class TS3ClientService extends services.Service
doStart = () => doStart = () =>
env = env =
HOME: process.env.HOME HOME: process.env.HOME
USERPROFILE: process.env.USERPROFILE
DISPLAY: process.env.DISPLAY DISPLAY: process.env.DISPLAY
XDG_RUNTIME_DIR: process.env.XDG_RUNTIME_DIR XDG_RUNTIME_DIR: process.env.XDG_RUNTIME_DIR
KDEDIRS: '' KDEDIRS: ''

1
src/services/xwm.coffee
View File

@ -42,6 +42,7 @@ module.exports = class XWindowManagerService extends services.Service
DISPLAY: process.env.DISPLAY DISPLAY: process.env.DISPLAY
XDG_RUNTIME_DIR: process.env.XDG_RUNTIME_DIR XDG_RUNTIME_DIR: process.env.XDG_RUNTIME_DIR
HOME: process.env.HOME HOME: process.env.HOME
USERPROFILE: process.env.USERPROFILE
# logging # logging
stdoutTokenizer = proc.stdout.pipe StreamSplitter "\n" stdoutTokenizer = proc.stdout.pipe StreamSplitter "\n"