diff options
| author | kali kaneko (leap communications) <kali@leap.se> | 2020-06-17 13:17:16 +0200 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2020-06-26 12:13:41 +0200 |
| commit | 253b12e140905d3a38bcd09d55b9c5dbf0601d66 (patch) | |
| tree | 3c2da8b70ebe0536cb4382b54d8a1a8c04f5cc4a /pkg | |
| parent | 35971c9a80879728a7bec38494a1edc1ecbf740f (diff) | |
[feat] working about dialog
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/backend/bitmask.go | 2 | ||||
| -rw-r--r-- | pkg/backend/status.go | 1 | ||||
| -rw-r--r-- | pkg/config/version/gen.go | 3 | ||||
| -rw-r--r-- | pkg/config/version/genver/gen.go | 3 | ||||
| -rw-r--r-- | pkg/config/version/genver/main.go (renamed from pkg/config/version/main.go) | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/pkg/backend/bitmask.go b/pkg/backend/bitmask.go index feff115..2b58859 100644 --- a/pkg/backend/bitmask.go +++ b/pkg/backend/bitmask.go @@ -6,6 +6,7 @@ import ( "0xacab.org/leap/bitmask-vpn/pkg/bitmask" "0xacab.org/leap/bitmask-vpn/pkg/config" + "0xacab.org/leap/bitmask-vpn/pkg/config/version" ) func initializeBitmask() { @@ -58,6 +59,7 @@ func initializeContext(provider, appName string) { DonateURL: config.DonateURL, AskForDonations: wantDonations(), DonateDialog: false, + Version: version.VERSION, Status: st, } go trigger(OnStatusChanged) diff --git a/pkg/backend/status.go b/pkg/backend/status.go index 6b13dd3..84b27b7 100644 --- a/pkg/backend/status.go +++ b/pkg/backend/status.go @@ -34,6 +34,7 @@ type connectionCtx struct { AskForDonations bool `json:"askForDonations"` DonateDialog bool `json:"donateDialog"` DonateURL string `json:"donateURL"` + Version string `json:"version"` Status status `json:"status"` bm bitmask.Bitmask cfg *config.Config diff --git a/pkg/config/version/gen.go b/pkg/config/version/gen.go deleted file mode 100644 index 334ed50..0000000 --- a/pkg/config/version/gen.go +++ /dev/null @@ -1,3 +0,0 @@ -package main - -//go:generate go run . -output version.go diff --git a/pkg/config/version/genver/gen.go b/pkg/config/version/genver/gen.go new file mode 100644 index 0000000..e453824 --- /dev/null +++ b/pkg/config/version/genver/gen.go @@ -0,0 +1,3 @@ +package main + +//go:generate go run . -output ../version.go diff --git a/pkg/config/version/main.go b/pkg/config/version/genver/main.go index a86b619..e0d80b0 100644 --- a/pkg/config/version/main.go +++ b/pkg/config/version/genver/main.go @@ -13,7 +13,7 @@ import ( ) var ( - flPackageName = flag.String("package", "main", "name for the generated golang package") + flPackageName = flag.String("package", "version", "name for the generated golang package") flVariableName = flag.String("variable", "VERSION", "variable name in the generated golang package") flOutputFile = flag.String("output", "", "output filename (default stdout)") ) |