From 72f48a1224ffba7045a4c0d148777ed3e4cc6c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Di=20Biase?= Date: Fri, 23 Jun 2017 16:24:38 -0300 Subject: [PATCH 1/3] Kill whitespaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Luis Di Biase --- scripts/setup.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/setup.js b/scripts/setup.js index a6527cff..3ce87563 100644 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -198,7 +198,7 @@ if(!fs.existsSync('./\.env')) { var pass = answers['password']; delete answers['email']; delete answers['password']; - + envfile.stringify(answers, function (err, str) { fs.outputFile('./\.env', str, function (fileErr) { if (fileErr) { @@ -220,9 +220,9 @@ if(!fs.existsSync('./\.env')) { if (err) { return console.error(chalk.red(userSaveErr)); } - + console.log(chalk.green('Successfully created user')); - + console.log(chalk.green('Have fun using TellForm!')); process.exit(1); }); From e68b8a6c1d57644a20520fca92c36d7cfd35a8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Di=20Biase?= Date: Fri, 23 Jun 2017 16:27:51 -0300 Subject: [PATCH 2/3] Setup: Exit when user dont want config deploy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Luis Di Biase --- scripts/setup.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/setup.js b/scripts/setup.js index 3ce87563..cda5b356 100644 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -230,6 +230,7 @@ if(!fs.existsSync('./\.env')) { }); } else { console.log(chalk.green('Have fun using TellForm!')); + process.exit(1); } }); } else { From 7f51e104c0dc66036e984fd57781057a7a58495d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Di=20Biase?= Date: Fri, 23 Jun 2017 16:48:11 -0300 Subject: [PATCH 3/3] We need to be sure to not end before .env file is written MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Luis Di Biase --- scripts/setup.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/setup.js b/scripts/setup.js index cda5b356..551dc026 100644 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -200,12 +200,14 @@ if(!fs.existsSync('./\.env')) { delete answers['password']; envfile.stringify(answers, function (err, str) { - fs.outputFile('./\.env', str, function (fileErr) { - if (fileErr) { - return console.error(chalk.red(fileErr)); - } - console.log(chalk.green('Successfully created .env file')); - }); + try { + fs.outputFileSync('./\.env', str); + } catch (fileErr) { + return console.error(chalk.red(fileErr)); + } + + console.log(chalk.green('Successfully created .env file')); + user = new User({ firstName: 'Admin', lastName: 'Account',