From 076077223a2fd087d9ca2ce6ec20819e03ddaf6b Mon Sep 17 00:00:00 2001
From: coderaiser <coderaiser@cloudcmd.io>
Date: Sun, 5 Mar 2017 14:15:42 +0200
Subject: [PATCH] chore(cloudcmd) add choose

---
 bin/cloudcmd.js | 11 +++++++++--
 server/env.js   |  9 ++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js
index 0a94f09b..d8a2dba3 100755
--- a/bin/cloudcmd.js
+++ b/bin/cloudcmd.js
@@ -9,6 +9,13 @@ const exit = require(DIR_SERVER + 'exit');
 const config = require(DIR_SERVER + 'config');
 const env = require(DIR_SERVER + 'env');
 
+const choose = (a, b) => {
+    if (!a && typeof a !== 'boolean')
+        return b;
+    
+    return a;
+};
+
 const argv = process.argv;
 const args = require('minimist')(argv.slice(2), {
     string: [
@@ -52,10 +59,10 @@ const args = require('minimist')(argv.slice(2), {
         prefix      : config('prefix') || '',
         progress    : config('progress'),
         console     : config('console'),
-        terminal    : env.bool('terminal') || config('terminal'),
+        terminal    : choose(env.bool('terminal'), config('terminal')),
         
         'terminal-path': env('terminal_path') || config('terminalPath'),
-        'config-dialog': env.bool('config_dialog') || config('configDialog'),
+        'config-dialog': choose(env.bool('config_dialog'), config('configDialog')),
         'one-panel-mode': config('onePanelMode'),
         'html-dialogs': config('htmlDialogs')
     },
diff --git a/server/env.js b/server/env.js
index 7ccdcc49..bc6d5eff 100644
--- a/server/env.js
+++ b/server/env.js
@@ -4,7 +4,14 @@ const env = process.env;
 const up = (a) => a.toUpperCase();
 
 module.exports = parse;
-module.exports.bool = (name) => Boolean(parse(name));
+module.exports.bool = (name) => {
+    const value = parse(name);
+    
+    if (value === 'false')
+        return false;
+    
+    return value;
+};
 
 function parse(name) {
     const small = `cloudcmd_${name}`;