From 0bda75c9d9340733ede0b4ab890a7ca67a3e317c Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 25 Oct 2018 13:10:57 +0300 Subject: [PATCH] feature(cloudcmd) do not relate --prefix-socket to --prefix when it unset --- 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 e331e0d1..684a9a7d 100755 --- a/bin/cloudcmd.js +++ b/bin/cloudcmd.js @@ -158,8 +158,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); @@ -184,7 +183,7 @@ function main() { editor: args.editor, packer: args.packer, prefix: args.prefix, - prefixSocket: args['prefix-socket'] || args.prefix, // MAJOR: remove condition on v12 + prefixSocket: args['prefix-socket'], columns: args.columns, }; diff --git a/server/cloudcmd.js b/server/cloudcmd.js index a05da3f5..df077406 100644 --- a/server/cloudcmd.js +++ b/server/cloudcmd.js @@ -70,7 +70,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);