summaryrefslogtreecommitdiff
path: root/pkg/helper
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2019-01-15 17:19:19 +0100
committerRuben Pollan <meskio@sindominio.net>2019-01-15 17:26:06 +0100
commit52d7fa7c91dd5bad49f07e33956681b5e341c6fa (patch)
tree0cd14b39203ef5652ee2c76ac27320db4abb4ef8 /pkg/helper
parent80b6aef1206fb63f1a2985f003f6b484a23bb949 (diff)
[feat] move provider configuration into a set of constants
Diffstat (limited to 'pkg/helper')
-rw-r--r--pkg/helper/darwin.go3
-rw-r--r--pkg/helper/linux.go4
-rw-r--r--pkg/helper/windows.go4
3 files changed, 8 insertions, 3 deletions
diff --git a/pkg/helper/darwin.go b/pkg/helper/darwin.go
index 7261de8..ff4ae4d 100644
--- a/pkg/helper/darwin.go
+++ b/pkg/helper/darwin.go
@@ -36,11 +36,12 @@ import (
"path"
"strings"
+ "0xacab.org/leap/bitmask-systray/pkg/config"
"github.com/sevlyar/go-daemon"
)
const (
- appPath = "/Applications/RiseupVPN.app/"
+ appPath = "/Applications/" + config.ApplicationName + ".app/"
helperPath = appPath + "Contents/helper/"
LogFolder = helperPath
openvpnPath = appPath + "Contents/Resources/openvpn.leap"
diff --git a/pkg/helper/linux.go b/pkg/helper/linux.go
index 88c3e10..79d301d 100644
--- a/pkg/helper/linux.go
+++ b/pkg/helper/linux.go
@@ -20,6 +20,8 @@ import (
"log"
"os"
"os/exec"
+
+ "0xacab.org/leap/bitmask-systray/pkg/config"
)
const (
@@ -27,7 +29,7 @@ const (
openvpnGroup = "nogroup"
LogFolder = "/var/log/"
systemOpenvpnPath = "/usr/sbin/openvpn"
- snapOpenvpnPath = "/snap/bin/riseup-vpn.openvpn"
+ snapOpenvpnPath = "/snap/bin/" + config.BinaryName + ".openvpn"
)
var (
diff --git a/pkg/helper/windows.go b/pkg/helper/windows.go
index a19c92b..4e4e89d 100644
--- a/pkg/helper/windows.go
+++ b/pkg/helper/windows.go
@@ -20,10 +20,12 @@ import (
"log"
"os"
"os/exec"
+
+ "0xacab.org/leap/bitmask-systray/pkg/config"
)
const (
- appPath = `C:\Program Files\RiseupVPN\`
+ appPath = `C:\Program Files\` + config.ApplicationName + `\`
LogFolder = appPath
openvpnPath = appPath + `openvpn.exe`
chocoOpenvpnPath = `C:\Program Files\OpenVPN\bin\openvpn.exe`