From 2acbb45cb534a479275c378683df34b87fe5dae9 Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Wed, 16 Jan 2019 23:10:40 +0100
Subject: [PATCH] [refactor] rename the imports into bitmask-vpn
---
README.md | 4 ++--
cmd/bitmask-connect/main.go | 4 ++--
cmd/bitmask-helper/main.go | 4 ++--
cmd/bitmask-vpn/main.go | 4 ++--
pkg/bitmask/bitmaskd.go | 2 +-
pkg/bitmask/standalone.go | 2 +-
pkg/bitmaskd/main.go | 2 +-
pkg/helper/darwin.go | 2 +-
pkg/helper/linux.go | 2 +-
pkg/helper/windows.go | 2 +-
pkg/standalone/bonafide.go | 2 +-
pkg/standalone/launcher_linux.go | 2 +-
pkg/standalone/main.go | 2 +-
pkg/systray/config.go | 2 +-
pkg/systray/notificator.go | 2 +-
pkg/systray/pid.go | 2 +-
pkg/systray/run.go | 4 ++--
pkg/systray/signal_unix.go | 2 +-
pkg/systray/signal_windows.go | 2 +-
pkg/systray/systray.go | 6 +++---
20 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/README.md b/README.md
index 280b975d..4e751163 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Install dependencies:
Build the systray:
```
- $ git clone 0xacab.org/leap/bitmask-systray
+ $ git clone 0xacab.org/leap/bitmask-vpn
$ cd bitmask-systray
$ go get .
$ go build
@@ -26,7 +26,7 @@ Using homebrew:
```
$ brew install golang zmq pkg-config
$ brew install --default-names gnu-sed
- $ git clone 0xacab.org/leap/bitmask-systray
+ $ git clone 0xacab.org/leap/bitmask-vpn
$ cd bitmask-systray
$ go get .
$ go build
diff --git a/cmd/bitmask-connect/main.go b/cmd/bitmask-connect/main.go
index 158f422a..9046d5c1 100644
--- a/cmd/bitmask-connect/main.go
+++ b/cmd/bitmask-connect/main.go
@@ -22,8 +22,8 @@ import (
"os"
"os/signal"
- "0xacab.org/leap/bitmask-systray/pkg/bitmask"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/bitmask"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
"golang.org/x/text/language"
"golang.org/x/text/message"
)
diff --git a/cmd/bitmask-helper/main.go b/cmd/bitmask-helper/main.go
index 96737631..ce32b4ea 100644
--- a/cmd/bitmask-helper/main.go
+++ b/cmd/bitmask-helper/main.go
@@ -19,8 +19,8 @@ import (
"log"
"path"
- "0xacab.org/leap/bitmask-systray/pkg/config"
- "0xacab.org/leap/bitmask-systray/pkg/helper"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/helper"
)
const (
diff --git a/cmd/bitmask-vpn/main.go b/cmd/bitmask-vpn/main.go
index 08ccbf17..a9b23896 100644
--- a/cmd/bitmask-vpn/main.go
+++ b/cmd/bitmask-vpn/main.go
@@ -23,8 +23,8 @@ import (
"path"
"runtime"
- "0xacab.org/leap/bitmask-systray/pkg/config"
- "0xacab.org/leap/bitmask-systray/pkg/systray"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/systray"
"github.com/jmshal/go-locale"
"golang.org/x/text/message"
)
diff --git a/pkg/bitmask/bitmaskd.go b/pkg/bitmask/bitmaskd.go
index ad4da317..04b965cf 100644
--- a/pkg/bitmask/bitmaskd.go
+++ b/pkg/bitmask/bitmaskd.go
@@ -20,7 +20,7 @@ import (
"errors"
"log"
- "0xacab.org/leap/bitmask-systray/pkg/bitmaskd"
+ "0xacab.org/leap/bitmask-vpn/pkg/bitmaskd"
"golang.org/x/text/message"
)
diff --git a/pkg/bitmask/standalone.go b/pkg/bitmask/standalone.go
index f3f7602b..8ae6f395 100644
--- a/pkg/bitmask/standalone.go
+++ b/pkg/bitmask/standalone.go
@@ -24,7 +24,7 @@ import (
"path/filepath"
"regexp"
- "0xacab.org/leap/bitmask-systray/pkg/standalone"
+ "0xacab.org/leap/bitmask-vpn/pkg/standalone"
pmautostart "github.com/ProtonMail/go-autostart"
"golang.org/x/text/message"
)
diff --git a/pkg/bitmaskd/main.go b/pkg/bitmaskd/main.go
index f2ca6504..b0d03496 100644
--- a/pkg/bitmaskd/main.go
+++ b/pkg/bitmaskd/main.go
@@ -25,7 +25,7 @@ import (
"path"
"time"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
)
const (
diff --git a/pkg/helper/darwin.go b/pkg/helper/darwin.go
index ff4ae4db..49924e54 100644
--- a/pkg/helper/darwin.go
+++ b/pkg/helper/darwin.go
@@ -36,7 +36,7 @@ import (
"path"
"strings"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
"github.com/sevlyar/go-daemon"
)
diff --git a/pkg/helper/linux.go b/pkg/helper/linux.go
index 79d301d7..8ee30372 100644
--- a/pkg/helper/linux.go
+++ b/pkg/helper/linux.go
@@ -21,7 +21,7 @@ import (
"os"
"os/exec"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
)
const (
diff --git a/pkg/helper/windows.go b/pkg/helper/windows.go
index 4e4e89dd..bc86e799 100644
--- a/pkg/helper/windows.go
+++ b/pkg/helper/windows.go
@@ -21,7 +21,7 @@ import (
"os"
"os/exec"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
)
const (
diff --git a/pkg/standalone/bonafide.go b/pkg/standalone/bonafide.go
index a0ed3b62..ac09362b 100644
--- a/pkg/standalone/bonafide.go
+++ b/pkg/standalone/bonafide.go
@@ -30,7 +30,7 @@ import (
"strings"
"time"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
)
const (
diff --git a/pkg/standalone/launcher_linux.go b/pkg/standalone/launcher_linux.go
index b7e5f3d9..b211b709 100644
--- a/pkg/standalone/launcher_linux.go
+++ b/pkg/standalone/launcher_linux.go
@@ -22,7 +22,7 @@ import (
"os"
"os/exec"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
)
const (
diff --git a/pkg/standalone/main.go b/pkg/standalone/main.go
index d5618e54..319af795 100644
--- a/pkg/standalone/main.go
+++ b/pkg/standalone/main.go
@@ -20,7 +20,7 @@ import (
"log"
"os"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
"github.com/apparentlymart/go-openvpn-mgmt/openvpn"
)
diff --git a/pkg/systray/config.go b/pkg/systray/config.go
index 1bacb1ba..c40a2797 100644
--- a/pkg/systray/config.go
+++ b/pkg/systray/config.go
@@ -21,7 +21,7 @@ import (
"path"
"time"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
"golang.org/x/text/message"
)
diff --git a/pkg/systray/notificator.go b/pkg/systray/notificator.go
index 754a2e81..80d08c26 100644
--- a/pkg/systray/notificator.go
+++ b/pkg/systray/notificator.go
@@ -22,7 +22,7 @@ import (
"runtime"
"time"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
"0xacab.org/leap/go-dialog"
"github.com/skratchdot/open-golang/open"
)
diff --git a/pkg/systray/pid.go b/pkg/systray/pid.go
index 6a1b32c2..ba3a6f34 100644
--- a/pkg/systray/pid.go
+++ b/pkg/systray/pid.go
@@ -10,7 +10,7 @@ import (
"strings"
"syscall"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
"github.com/mitchellh/go-ps"
)
diff --git a/pkg/systray/run.go b/pkg/systray/run.go
index 73dc8531..8877d646 100644
--- a/pkg/systray/run.go
+++ b/pkg/systray/run.go
@@ -19,8 +19,8 @@ import (
"log"
"os"
- "0xacab.org/leap/bitmask-systray/pkg/bitmask"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/pkg/bitmask"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
)
func Run(conf *Config) {
diff --git a/pkg/systray/signal_unix.go b/pkg/systray/signal_unix.go
index 06b59ae8..d9e784d5 100644
--- a/pkg/systray/signal_unix.go
+++ b/pkg/systray/signal_unix.go
@@ -21,7 +21,7 @@ import (
"os/signal"
"syscall"
- "0xacab.org/leap/bitmask-systray/pkg/bitmask"
+ "0xacab.org/leap/bitmask-vpn/pkg/bitmask"
)
func listenSignals(bm bitmask.Bitmask) {
diff --git a/pkg/systray/signal_windows.go b/pkg/systray/signal_windows.go
index f96212cb..ac0528c4 100644
--- a/pkg/systray/signal_windows.go
+++ b/pkg/systray/signal_windows.go
@@ -17,7 +17,7 @@
package systray
import (
- "0xacab.org/leap/bitmask-systray/pkg/bitmask"
+ "0xacab.org/leap/bitmask-vpn/pkg/bitmask"
)
func listenSignals(bm bitmask.Bitmask) {
diff --git a/pkg/systray/systray.go b/pkg/systray/systray.go
index 29e798d5..11ed8c39 100644
--- a/pkg/systray/systray.go
+++ b/pkg/systray/systray.go
@@ -22,9 +22,9 @@ import (
"os/signal"
"time"
- "0xacab.org/leap/bitmask-systray/icon"
- "0xacab.org/leap/bitmask-systray/pkg/bitmask"
- "0xacab.org/leap/bitmask-systray/pkg/config"
+ "0xacab.org/leap/bitmask-vpn/icon"
+ "0xacab.org/leap/bitmask-vpn/pkg/bitmask"
+ "0xacab.org/leap/bitmask-vpn/pkg/config"
"github.com/getlantern/systray"
"github.com/skratchdot/open-golang/open"
)
--
GitLab