From d71066b95eb3e6a7a1dff35ce0b46345d5f89ca7 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 28 Mar 2019 16:56:59 +0200 Subject: [PATCH] feature(cloudcmd) split prefix and prefixSocket finally --- bin/cloudcmd.js | 5 ++--- server/cloudcmd.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js index d9f8a043..95da4136 100755 --- a/bin/cloudcmd.js +++ b/bin/cloudcmd.js @@ -163,8 +163,7 @@ function main() { config('terminalAutoRestart', args['terminal-auto-restart']); config('editor', args.editor); config('prefix', prefixer(args.prefix)); - // MAJOR: remove condition on v12 - config('prefixSocket', prefixer(args['prefix-socket']) || config('prefix')); + config('prefixSocket', prefixer(args['prefix-socket'])); config('root', args.root || '/'); config('vim', args.vim); config('columns', args.columns); @@ -192,7 +191,7 @@ function main() { editor: config('editor'), packer: config('packer'), prefix: config('prefix'), - prefixSocket: config('prefixSocket') || config('prefix'), // MAJOR: remove condition on v12 + prefixSocket: config('prefixSocket'), columns: config('columns'), }; diff --git a/server/cloudcmd.js b/server/cloudcmd.js index 0f790aba..b6193626 100644 --- a/server/cloudcmd.js +++ b/server/cloudcmd.js @@ -71,7 +71,7 @@ module.exports = (params) => { config('configDialog', defaultValue('configDialog', options)); const {prefix} = prefixer(options.prefix); - const prefixSocket = prefixer(options.prefixSocket) || prefix; // MAJOR: remove condition on v12 + const prefixSocket = prefixer(options.prefixSocket); if (p.socket) listen(prefixSocket, p.socket);