Merge pull request #182

Fixed Debian dependencies issue

wallet 2.0/debian.json

@@ -8,5 +8,5 @@
   "lintianOverrides": [
     "changelog-file-missing-in-native-package"
   ],
-  "depends": ["openvpn", "libgconf2-4", "gksu","shadowsocks-libev", "wireguard"]
+  "depends": ["openvpn", "shadowsocks-libev", "wireguard", "gksu | policykit-1", "libgconf-2-4 | libgconf2-4"]
 }

wallet 2.0/electron.js

@@ -32,7 +32,7 @@ function windowManager() {
   this.createWindow = () => {
     if (process.platform === 'win32') screenHeight = 700;
     else screenHeight = 672;
-    this.window = new BrowserWindow({ title: "Sentinel Network - dVPN - alpha-0.1.3", resizable: false, maximizable: false, width: 1000, height: screenHeight, icon: './public/icon256x256.png' });
+    this.window = new BrowserWindow({ title: "Sentinel Network - dVPN - alpha-0.1.4", resizable: false, maximizable: false, width: 1000, height: screenHeight, icon: './public/icon256x256.png' });
     this.window.loadURL(url.format({
       pathname: path.join(__dirname, 'build/index.html'),
       protocol: 'file:',

wallet 2.0/installers/windows/createinstaller.js

@@ -1,6 +1,6 @@
 const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller
 const path = require('path')
-const appVersion='0.1.3'
+const appVersion='0.1.4'
 
 getInstallerConfig()
   .then(createWindowsInstaller)

wallet 2.0/package.json

@@ -3,7 +3,7 @@
   "description": "Sentinel Network - dVPN Desktop Application",
   "productName": "Sentinel",
   "author": "Dev Team <[email protected]>",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "private": true,
   "main": "electron.js",
   "license": "MIT",
@@ -40,7 +40,7 @@
     "package-mac": "electron-packager . Sentinel --overwrite --asar --platform=darwin --arch=x64 --icon=public/icon256x256.ico --prune=true --out=release-builds --extra-resource=public/gaiacli",
     "package-win": "electron-packager . sentinel --overwrite --asar --platform=win32 --icon=public/icon256x256.ico --prune=true --out=release-builds --win32metadata.CompanyName=Sentinel --win32metadata.FileDescription=\"Application for Sentinel\" --win32metadata.requested-execution-level=requireAdministrator --win32metadata.ProductName=\"Sentinel\"",
     "package-linux": "electron-packager . sentinel --overwrite --asar --platform=linux --arch=x64 --icon=public/icon256x256.png --prune=true --out=release-builds",
-    "create-installer-mac": "electron-installer-dmg ./release-builds/Sentinel-darwin-x64/Sentinel.app Sentinel-alpha-0.1.3 --out=release-builds --overwrite --icon=public/icon256x256.icns",
+    "create-installer-mac": "electron-installer-dmg ./release-builds/Sentinel-darwin-x64/Sentinel.app Sentinel-alpha-0.1.4 --out=release-builds --overwrite --icon=public/icon256x256.icns",
     "create-installer-win": "node installers/windows/createinstaller.js",
     "create-debian-installer": "electron-installer-debian --src release-builds/sentinel-linux-x64/ --arch amd64 --config debian.json"
   },

wallet 2.0/public/launch_wallet

@@ -1,3 +1,8 @@
 #!/bin/sh
 
-gksu /usr/lib/sentinel/sentinel
+if command -v pkexec > /dev/null
+then
+  pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY /usr/lib/sentinel/sentinel
+else
+  gksu /usr/lib/sentinel/sentinel
+fi

wallet 2.0/scripts/debian.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+rm -rf node_modules build release-builds && \
+yarn && \
+sed -i '/libgconf2-4/d' node_modules/electron-installer-debian/src/dependencies.js && \
+yarn build && \
+yarn package-linux && \
+cp -r public/ release-builds/sentinel-linux-x64/ && \
+yarn create-debian-installer

wallet 2.0/src/Actions/connectSOCKS.js

@@ -129,7 +129,7 @@ export async function checksentinelSocks(cb) {
             cb(null);
         } else {
             let username = getUserHome();
-            exec(`${username}\\AppData\\Local\\Sentinel\\app-0.1.3\\resources\\extras\\socks5\\service.exe`, function (execErr, execOut, execStd) {
+            exec(`${username}\\AppData\\Local\\Sentinel\\app-0.1.4\\resources\\extras\\socks5\\service.exe`, function (execErr, execOut, execStd) {
                 exec(`net start sentinelSocksv12`, function (stderr, stdout, error) {
                     cb(null);
                 });