From 05b0dc2d80fd31155b21ad45f75d8e8b5f4bb9ba Mon Sep 17 00:00:00 2001
From: "Kireev, Eugene" <Eugene.Kireev@news.com.au>
Date: Mon, 12 Mar 2018 13:58:35 +1100
Subject: [PATCH] do not use hjson for plugins.env.js

---
 plugins.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins.js b/plugins.js
index 05d245c8a..2e957d30b 100644
--- a/plugins.js
+++ b/plugins.js
@@ -26,17 +26,20 @@ try {
   if (PLUGINS_JSON && PLUGINS_JSON.length > 0) {
     debug('Now using TALK_PLUGINS_JSON environment variable for plugins');
     pluginsPath = envPlugins;
-  } else if (fs.existsSync(customPlugins)) {
-    debug(`Now using ${customPlugins} for plugins`);
-    pluginsPath = customPlugins;
+    plugins = require(pluginsPath);
   } else {
-    debug(`Now using ${defaultPlugins} for plugins`);
-    pluginsPath = defaultPlugins;
-  }
+      if (fs.existsSync(customPlugins)) {
+        debug(`Now using ${customPlugins} for plugins`);
+        pluginsPath = customPlugins;
+      } else {
+        debug(`Now using ${defaultPlugins} for plugins`);
+        pluginsPath = defaultPlugins;
+      }
 
-  // Load/parse the plugin content using hjson.
-  const pluginContent = fs.readFileSync(pluginsPath, 'utf8');
-  plugins = hjson.parse(pluginContent);
+      // Load/parse the plugin content using hjson.
+      const pluginContent = fs.readFileSync(pluginsPath, 'utf8');
+      plugins = hjson.parse(pluginContent);
+  }
 } catch (err) {
   if (err.code === 'ENOENT') {
     console.error(