From 52d7fa7c91dd5bad49f07e33956681b5e341c6fa Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Tue, 15 Jan 2019 17:19:19 +0100 Subject: [feat] move provider configuration into a set of constants --- cmd/bitmask-connect/main.go | 6 +++--- cmd/bitmask-vpn/main.go | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'cmd') diff --git a/cmd/bitmask-connect/main.go b/cmd/bitmask-connect/main.go index e418112..158f422 100644 --- a/cmd/bitmask-connect/main.go +++ b/cmd/bitmask-connect/main.go @@ -23,13 +23,13 @@ import ( "os/signal" "0xacab.org/leap/bitmask-systray/pkg/bitmask" + "0xacab.org/leap/bitmask-systray/pkg/config" "golang.org/x/text/language" "golang.org/x/text/message" ) const ( - provider = "riseup.net" - logFile = "systray.log" + logFile = "systray.log" ) var version string @@ -55,7 +55,7 @@ func start() { } defer b.Close() - err = b.StartVPN(provider) + err = b.StartVPN(config.Provider) if err != nil { log.Println(err) os.Exit(1) diff --git a/cmd/bitmask-vpn/main.go b/cmd/bitmask-vpn/main.go index fb3fd1f..08ccbf1 100644 --- a/cmd/bitmask-vpn/main.go +++ b/cmd/bitmask-vpn/main.go @@ -30,9 +30,7 @@ import ( ) const ( - provider = "riseup.net" - applicationName = "RiseupVPN" - logFile = "systray.log" + logFile = "systray.log" ) var version string @@ -59,8 +57,6 @@ func main() { os.Exit(0) } - conf.Provider = provider - conf.ApplicationName = applicationName conf.Version = version conf.Printer = initPrinter() systray.Run(conf) -- cgit v1.2.3