From f471d8134adf6f524c434df1a35b2daf37c2bd47 Mon Sep 17 00:00:00 2001
From: ziajka <dominik@gns3.net>
Date: Tue, 5 Mar 2019 12:01:24 +0100
Subject: [PATCH] Support VPCS delivered with WebUI on gns3server, Fixes: #325

---
 local-server.js | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/local-server.js b/local-server.js
index 659eefdb..cf3f9cb2 100644
--- a/local-server.js
+++ b/local-server.js
@@ -194,6 +194,22 @@ async function configure(configPath, server) {
   fs.writeFileSync(configPath, ini.stringify(config, { section: 'Server' }));
 }
 
+async function setPATHEnv() {
+  const vpcsLookup = [
+    path.join(__dirname, 'dist', 'vpcs'),
+    path.join(path.dirname(app.getPath('exe')), 'dist', 'vpcs')
+  ];
+  
+  // prevent adding duplicates
+  let extra = [
+    ...vpcsLookup
+  ].filter((dir) => {
+    return process.env.PATH.indexOf(dir) < 0;
+  });
+  extra.push(process.env.PATH);
+  process.env.PATH = extra.join(";");
+}
+
 async function run(server, options) {
   if(!options) {
     options = {};
@@ -202,11 +218,14 @@ async function run(server, options) {
   const logStdout = options.logStdout || false;
   const logSterr = options.logSterr || false;
 
-  console.log(`Configuring`)
+  console.log(`Configuring`);
 
   const configPath = await getIniFile(server);
   await configure(configPath, server);
 
+  console.log(`Setting up PATH`);
+  await setPATHEnv();
+
   console.log(`Running '${server.path}'`);
 
   let serverProcess = spawn(server.path, getServerArguments(server, {}, configPath));
@@ -271,14 +290,15 @@ async function main() {
   });
 }
 
-ipcMain.on('local-server-run', async function (event, server) {
-  const responseChannel = getChannelForServer();
-  await run(server);
-  event.sender.send(responseChannel, {
-    success: true
+if(ipcMain) {
+  ipcMain.on('local-server-run', async function (event, server) {
+    const responseChannel = getChannelForServer();
+    await run(server);
+    event.sender.send(responseChannel, {
+      success: true
+    });
   });
-});
-
+}
 
 if (require.main === module) {
   process.on('SIGINT', function() {