From 178558973b596d4614957f3a2c61db786398b47b Mon Sep 17 00:00:00 2001 From: jash Date: Mon, 15 Oct 2018 19:21:32 +0200 Subject: [PATCH] made uacomment optional --- install/generator-cyphernode/generators/app/index.js | 9 +++++++++ .../generators/app/prompters/100_bitcoin.js | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/install/generator-cyphernode/generators/app/index.js b/install/generator-cyphernode/generators/app/index.js index 20b0e08..7eab1d1 100644 --- a/install/generator-cyphernode/generators/app/index.js +++ b/install/generator-cyphernode/generators/app/index.js @@ -139,6 +139,15 @@ module.exports = class extends Generator { return this.props && this.props[name]; } + _optional(input,validator) { + if( input === undefined || + input === null || + input === '' ) { + return true; + } + return validator(input); + } + _ipOrFQDNValidator( host ) { host = (host+"").trim(); if( !(validator.isIP(host) || diff --git a/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js b/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js index 4ed3412..5d4f11e 100644 --- a/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js +++ b/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js @@ -77,7 +77,7 @@ module.exports = { default: utils._getDefault( 'bitcoin_uacomment' ), message: prefix()+'Any UA comment?'+'\n', filter: utils._trimFilter, - validate: utils._UACommentValidator + validate: (input)=> {return utils._optional(input,utils._UACommentValidator) } }]; }, env: function( props ) {