From 879470f417ed930ce5507b2c359332002a8adf84 Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Fri, 17 Feb 2017 22:11:35 -0700
Subject: [PATCH] ESlint brace-style

---
 .eslintrc           | 4 ++--
 public/src/utils.js | 3 +--
 src/install.js      | 7 +++++--
 src/logger.js       | 3 +--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 22e7d07d94..b5ab35f18b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -10,16 +10,16 @@
             "exports": "always-multiline",
             "functions": "never"
         }],
-        // "linebreak-style": "off",
         "import/no-unresolved": "off",
         "import/no-extraneous-dependencies": "off",
+        // "linebreak-style": "off",
         // "one-var": "off",
         // "no-undef": "off",
         "max-len": "off",
         "no-new": "off",
         "max-nested-callbacks": "off",
         "no-mixed-requires": "off",
-        "brace-style": "off",
+        // "brace-style": "off",
         "max-statements-per-line": "off",
         "no-unused-vars": "off",
         "no-mixed-spaces-and-tabs": "off",
diff --git a/public/src/utils.js b/public/src/utils.js
index b64ce63a5b..6a2e444438 100644
--- a/public/src/utils.js
+++ b/public/src/utils.js
@@ -214,8 +214,7 @@
 			}
 			if (n > 999999) {
 				return (n / 1000000).toFixed(1) + 'm';
-			}
-			else if(n > 999) {
+			} else if(n > 999) {
 				return (n / 1000).toFixed(1) + 'k';
 			}
 			return n;
diff --git a/src/install.js b/src/install.js
index 4c3e4df0ec..9e463b5e25 100644
--- a/src/install.js
+++ b/src/install.js
@@ -513,8 +513,11 @@ install.setup = function (callback) {
 				if (err) {
 					return next(err);
 				}
-				if (!uptodate) { upgrade.upgrade(next); }
-				else { next(); }
+				if (!uptodate) {
+					upgrade.upgrade(next);
+				} else {
+					next();
+				}
 			});
 		},
 	], function (err, results) {
diff --git a/src/logger.js b/src/logger.js
index 87e14d2f65..29138b2e4d 100644
--- a/src/logger.js
+++ b/src/logger.js
@@ -66,8 +66,7 @@ var opts = {
 			} else {
 				opts.streams.log.f = process.stdout;
 			}
-		}
-		else {
+		} else {
 			Logger.close(opts.streams.log);
 		}
 	};