From 0e27c744bf3369b562a00f43af2ead21bc23f931 Mon Sep 17 00:00:00 2001 From: jash Date: Sun, 21 Oct 2018 18:36:39 +0200 Subject: [PATCH] removed some newlines --- .../generators/app/prompters/000_cyphernode.js | 10 +++++----- .../generators/app/prompters/010_authapi.js | 2 +- .../generators/app/prompters/100_bitcoin.js | 12 ++++++------ .../generators/app/prompters/200_lightning.js | 8 ++++---- .../generators/app/prompters/300_electrum.js | 2 +- .../generators/app/prompters/999_installer.js | 12 ++++++------ 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/install/generator-cyphernode/generators/app/prompters/000_cyphernode.js b/install/generator-cyphernode/generators/app/prompters/000_cyphernode.js index 30838db..2e15d97 100644 --- a/install/generator-cyphernode/generators/app/prompters/000_cyphernode.js +++ b/install/generator-cyphernode/generators/app/prompters/000_cyphernode.js @@ -20,14 +20,14 @@ module.exports = { // input, confirm, list, rawlist, expand, checkbox, password, editor type: 'checkbox', name: 'features', - message: prefix()+'What features do you want to add to your cyphernode?'+'\n', + message: prefix()+'What features do you want to add to your cyphernode?', choices: utils._featureChoices() }, { type: 'list', name: 'net', default: utils._getDefault( 'net' ), - message: prefix()+'What net do you want to run on?'+'\n', + message: prefix()+'What net do you want to run on?', choices: [{ name: "Testnet", value: "testnet" @@ -40,7 +40,7 @@ module.exports = { type: 'input', name: 'username', default: utils._getDefault( 'username' ), - message: prefix()+'What username will cyphernode run under?'+'\n', + message: prefix()+'What username will cyphernode run under?', filter: utils._trimFilter, validate: utils._usernameValidator }, @@ -48,7 +48,7 @@ module.exports = { type: 'input', name: 'xpub', default: utils._getDefault( 'xpub' ), - message: prefix()+'What is your xpub to watch?'+'\n', + message: prefix()+'What is your xpub to watch?', filter: utils._trimFilter, validate: utils._xkeyValidator }, @@ -56,7 +56,7 @@ module.exports = { type: 'input', name: 'derivation_path', default: utils._getDefault( 'derivation_path' ), - message: prefix()+'What is your address derivation path?'+'\n', + message: prefix()+'What is your address derivation path?', filter: utils._trimFilter, validate: utils._derivationPathValidator }]; diff --git a/install/generator-cyphernode/generators/app/prompters/010_authapi.js b/install/generator-cyphernode/generators/app/prompters/010_authapi.js index d6d1549..77858fb 100644 --- a/install/generator-cyphernode/generators/app/prompters/010_authapi.js +++ b/install/generator-cyphernode/generators/app/prompters/010_authapi.js @@ -20,7 +20,7 @@ module.exports = { type: 'password', name: 'auth_clientkeyspassword', default: utils._getDefault( 'auth_clientkeyspassword' ), - message: prefix()+'Enter a password to protect your client keys with'+'\n', + message: prefix()+'Enter a password to protect your client keys with', filter: utils._trimFilter, validate: utils._notEmptyValidator }, diff --git a/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js b/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js index 5d4f11e..4f7dac9 100644 --- a/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js +++ b/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js @@ -28,7 +28,7 @@ module.exports = { type: 'list', name: 'bitcoin_mode', default: utils._getDefault( 'bitcoin_mode' ), - message: prefix()+'Where is your bitcoin full node running?'+'\n', + message: prefix()+'Where is your bitcoin full node running?', choices: [ { name: 'Nowhere! I want cyphernode to run one.', @@ -47,20 +47,20 @@ module.exports = { default: utils._getDefault( 'bitcoin_node_ip' ), filter: utils._trimFilter, validate: utils._ipOrFQDNValidator, - message: prefix()+'What is your full node ip address?'+'\n', + message: prefix()+'What is your full node ip address?', }, { type: 'input', name: 'bitcoin_rpcuser', default: utils._getDefault( 'bitcoin_rpcuser' ), - message: prefix()+'Name of bitcoin rpc user?'+'\n', + message: prefix()+'Name of bitcoin rpc user?', filter: utils._trimFilter, }, { type: 'password', name: 'bitcoin_rpcpassword', default: utils._getDefault( 'bitcoin_rpcpassword' ), - message: prefix()+'Password of bitcoin rpc user?'+'\n', + message: prefix()+'Password of bitcoin rpc user?', filter: utils._trimFilter, }, { @@ -68,14 +68,14 @@ module.exports = { type: 'confirm', name: 'bitcoin_prune', default: utils._getDefault( 'bitcoin_prune' ), - message: prefix()+'Run bitcoin node in prune mode?'+'\n', + message: prefix()+'Run bitcoin node in prune mode?', }, { when: bitcoinInternal, type: 'input', name: 'bitcoin_uacomment', default: utils._getDefault( 'bitcoin_uacomment' ), - message: prefix()+'Any UA comment?'+'\n', + message: prefix()+'Any UA comment?', filter: utils._trimFilter, validate: (input)=> {return utils._optional(input,utils._UACommentValidator) } }]; diff --git a/install/generator-cyphernode/generators/app/prompters/200_lightning.js b/install/generator-cyphernode/generators/app/prompters/200_lightning.js index 084eae1..2d9e792 100644 --- a/install/generator-cyphernode/generators/app/prompters/200_lightning.js +++ b/install/generator-cyphernode/generators/app/prompters/200_lightning.js @@ -30,7 +30,7 @@ module.exports = { type: 'list', name: 'lightning_implementation', default: utils._getDefault( 'lightning_implementation' ), - message: prefix()+'What lightning implementation do you want to use?'+'\n', + message: prefix()+'What lightning implementation do you want to use?', choices: [ { name: 'C-lightning', @@ -51,7 +51,7 @@ module.exports = { default: utils._getDefault( 'lightning_external_ip' ), filter: utils._trimFilter, validate: utils._ipOrFQDNValidator, - message: prefix()+'What external ip does your lightning node have?'+'\n', + message: prefix()+'What external ip does your lightning node have?', }, { when: featureCondition, @@ -60,7 +60,7 @@ module.exports = { default: utils._getDefault( 'lightning_nodename' ), filter: utils._trimFilter, validate: utils._notEmptyValidator, - message: prefix()+'What name has your lightning node?'+'\n', + message: prefix()+'What name has your lightning node?', }, { when: featureCondition, @@ -69,7 +69,7 @@ module.exports = { default: utils._getDefault( 'lightning_nodecolor' ), filter: utils._trimFilter, validate: utils._colorValidator, - message: prefix()+'What color has your lightning node?'+'\n', + message: prefix()+'What color has your lightning node?', }]; }, templates: function( props ) { diff --git a/install/generator-cyphernode/generators/app/prompters/300_electrum.js b/install/generator-cyphernode/generators/app/prompters/300_electrum.js index e5949c5..400075d 100644 --- a/install/generator-cyphernode/generators/app/prompters/300_electrum.js +++ b/install/generator-cyphernode/generators/app/prompters/300_electrum.js @@ -24,7 +24,7 @@ module.exports = { type: 'list', name: 'electrum_implementation', default: utils._getDefault( 'electrum_implementation' ), - message: prefix()+'What electrum implementation do you want to use?'+'\n', + message: prefix()+'What electrum implementation do you want to use?', choices: [ { name: 'Electrum personal server', diff --git a/install/generator-cyphernode/generators/app/prompters/999_installer.js b/install/generator-cyphernode/generators/app/prompters/999_installer.js index 81acf36..92efa0b 100644 --- a/install/generator-cyphernode/generators/app/prompters/999_installer.js +++ b/install/generator-cyphernode/generators/app/prompters/999_installer.js @@ -28,7 +28,7 @@ module.exports = { type: 'list', name: 'installer_mode', default: utils._getDefault( 'installer_mode' ), - message: prefix()+chalk.red('Where do you want to install cyphernode?')+'\n', + message: prefix()+chalk.red('Where do you want to install cyphernode?'), choices: [{ name: "Docker", value: "docker" @@ -47,7 +47,7 @@ module.exports = { default: utils._getDefault( 'proxy_datapath' ), filter: utils._trimFilter, validate: utils._pathValidator, - message: prefix()+'Where to store your proxy db?'+'\n', + message: prefix()+'Where to store your proxy db?', }, { when: function(props) { return installerDocker(props) && props.bitcoin_mode === 'internal' }, @@ -56,7 +56,7 @@ module.exports = { default: utils._getDefault( 'bitcoin_datapath' ), filter: utils._trimFilter, validate: utils._pathValidator, - message: prefix()+'Where is your blockchain data?'+'\n', + message: prefix()+'Where is your blockchain data?', }, { when: function(props) { return installerDocker(props) && props.features.indexOf('lightning') !== -1 }, @@ -65,21 +65,21 @@ module.exports = { default: utils._getDefault( 'lightning_datapath' ), filter: utils._trimFilter, validate: utils._pathValidator, - message: prefix()+'Where is your lightning node data?'+'\n', + message: prefix()+'Where is your lightning node data?', }, { when: function(props) { return installerDocker(props) && props.bitcoin_mode === 'internal' }, type: 'confirm', name: 'bitcoin_expose', default: utils._getDefault( 'bitcoin_expose' ), - message: prefix()+'Expose bitcoin full node outside of the docker network?'+'\n', + message: prefix()+'Expose bitcoin full node outside of the docker network?', }, { when: installerDocker, type: 'list', name: 'docker_mode', default: utils._getDefault( 'docker_mode' ), - message: prefix()+'What docker mode: docker swarm or docker-compose?'+'\n', + message: prefix()+'What docker mode: docker swarm or docker-compose?', choices: [{ name: "docker swarm", value: "swarm"