Problem report

2 files changed, 31 insertions, 4 deletions

diff --git a/app/lib/ipc-facade.js b/app/lib/ipc-facade.js
index 7a71861ae5..5b67dcb76f 100644
--- a/app/lib/ipc-facade.js
+++ b/app/lib/ipc-facade.js
@@ -210,12 +210,12 @@ export class RealIpc implements IpcFacade {
     });
   }
 
+  setCloseConnectionHandler(handler: () => void) {
+    this._ipc.setCloseConnectionHandler(handler);
+  }
+
   authenticate(sharedSecret: string): Promise<void> {
     return this._ipc.send('auth', sharedSecret)
       .then(this._ignoreResponse);
   }
-
-  setCloseConnectionHandler(handler: () => void) {
-    this._ipc.setCloseConnectionHandler(handler);
-  }
 }
diff --git a/app/lib/proc.js b/app/lib/proc.js
new file mode 100644
index 0000000000..d11fa392a5
--- /dev/null
+++ b/app/lib/proc.js
@@ -0,0 +1,27 @@
+// @flow
+
+import path from 'path';
+
+export function resolveBin(binaryName: string) {
+  const basepath = getBasePath();
+  return path.resolve(basepath, binaryName + getExtension());
+}
+
+function getBasePath() {
+  if (process.env.NODE_ENV === 'development') {
+    return process.env.MULLVAD_BACKEND || '../talpid_core/target/debug';
+
+  } else {
+    return process.resourcesPath;
+  }
+}
+
+function getExtension() {
+  switch (process.platform) {
+  case 'win32':
+    return '.exe';
+
+  default:
+    return '';
+  }
+}