From fa29aa3fafa2ef9fcc3fdb507d9e6344fc36f2ff Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Sun, 24 Jun 2018 02:16:04 -0600 Subject: [PATCH] proper TELEBIT_CONFIG vars --- .../skel/Library/LaunchAgents/cloud.telebit.remote.plist.tpl | 2 +- usr/share/template-launcher.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/usr/share/dist/etc/skel/Library/LaunchAgents/cloud.telebit.remote.plist.tpl b/usr/share/dist/etc/skel/Library/LaunchAgents/cloud.telebit.remote.plist.tpl index 37f1072..4a7bb9c 100644 --- a/usr/share/dist/etc/skel/Library/LaunchAgents/cloud.telebit.remote.plist.tpl +++ b/usr/share/dist/etc/skel/Library/LaunchAgents/cloud.telebit.remote.plist.tpl @@ -11,7 +11,7 @@ {TELEBIT_PATH}/bin/telebitd.js daemon --config - {TELEBIT_CONFIG_PATH} + {TELEBIT_CONFIGD} EnvironmentVariables diff --git a/usr/share/template-launcher.js b/usr/share/template-launcher.js index d5cd813..f584706 100644 --- a/usr/share/template-launcher.js +++ b/usr/share/template-launcher.js @@ -24,7 +24,8 @@ var vars = { , ].join(' ') , telebitUser: process.env.TELEBIT_USER || os.userInfo().username , telebitGroup: process.env.TELEBIT_GROUP || ('darwin' === os.platform() ? 'staff' : os.userInfo().username) -, telebitConfig: process.env.TELEBIT_CONFIG || path.join(os.homedir(), '.config/telebit/telebitd.yml') +, telebitConfig: process.env.TELEBIT_CONFIG || path.join(os.homedir(), '.config/telebit/telebit.yml') +, telebitConfigd: process.env.TELEBIT_CONFIGD || path.join(os.homedir(), '.config/telebit/telebitd.yml') }; files.forEach(function (f) { var text = fs.readFileSync(f[0], 'utf8') @@ -33,6 +34,7 @@ files.forEach(function (f) { .replace(/{TELEBIT_GROUP}/g, vars.telebitGroup) .replace(/{TELEBIT_RW_DIRS}/g, vars.telebitRwDirs) .replace(/{TELEBIT_CONFIG}/g, vars.telebitConfig) + .replace(/{TELEBIT_CONFIGD}/g, vars.telebitConfigd) ; fs.writeFileSync(f[1], text, 'utf8'); });