diff options
| author | kali kaneko (leap communications) <kali@leap.se> | 2020-06-16 18:39:43 +0200 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2020-06-16 18:39:43 +0200 |
| commit | a18e61aa1be37aa568552c69fbd743d25498b9bb (patch) | |
| tree | 99fe1735c79584a009bdb32b171799a36a848bfe | |
| parent | 1678e25710eed8af34fd513f2c9ecd6c8cdf07a3 (diff) | |
[docs] remove references to deprecated bitmaskd
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | pkg/bitmask/autostart.go | 1 |
3 files changed, 5 insertions, 12 deletions
@@ -3,9 +3,7 @@ # (c) LEAP Encryption Access Project, 2019-2020 ######################################################################### -.PHONY: all get build build_bitmaskd icon locales generate_locales clean - -TAGS ?= gtk_3_18 +.PHONY: all get build icon locales generate_locales clean XBUILD ?= no SKIP_CACHECK ?= no @@ -42,16 +40,15 @@ install_go: depends: -@make depends$(UNAME) - @go get -u golang.org/x/text/cmd/gotext github.com/cratonica/2goarray dependsLinux: - @sudo apt install libgtk-3-dev libappindicator3-dev golang pkg-config dh-golang golang-golang-x-text-dev cmake devscripts fakeroot debhelper curl + @sudo apt install golang pkg-config dh-golang golang-golang-x-text-dev cmake devscripts fakeroot debhelper curl @make -C docker deps @# debian needs also: snap install snapcraft --classic; snap install multipass --beta --classic dependsDarwin: # TODO - bootstrap homebrew if not there - @brew install python3 golang make pkg-config upx curl + @brew install python3 golang make pkg-config curl @brew install --default-names gnu-sed dependsCygwin: @@ -84,9 +81,6 @@ build_%: test: @go test -tags "integration $(TAGS)" ./... -build_bitmaskd: - @go build -tags "$(TAGS) bitmaskd" -ldflags "-X main.version=`git describe --tags`" ./cmd/* - build_win: powershell -Command '$$version=git describe --tags; go build -ldflags "-H windowsgui -X main.version=$$version" ./cmd/*' @@ -254,7 +248,7 @@ generate_locales: @gotext update -lang=$(lang_list) ./pkg/systray ./pkg/bitmask @make -C tools/transifex -locales/%/out.gotext.json: pkg/systray/systray.go pkg/systray/notificator.go pkg/bitmask/standalone.go pkg/bitmask/bitmaskd.go +locales/%/out.gotext.json: pkg/systray/systray.go pkg/systray/notificator.go pkg/bitmask/standalone.go @gotext update -lang=$* ./pkg/systray ./pkg/bitmask cmd/bitmask-vpn/catalog.go: $(foreach lang,$(LANGS),locales/$(lang)/messages.gotext.json) @@ -75,6 +75,6 @@ When you report an issue include the following information: * what you got * the version of the program. You can check the version on the about page. * the logs of the program. The location of the logs depends on the OS: - * linux: `/home/<your user>/.config/leap/bitmaskd.log` & `/home/<your user>/.config/leap/systray.log` + * linux: `/home/<your user>/.config/leap/systray.log` * OSX: `/Users/<your user>/Library/Preferences/leap/systray.log`, `/Applications/RiseupVPN.app/Contents/helper/helper.log` & `/Applications/RiseupVPN.app/Contents/helper/openvpn.log` * windows: `C:\Users\<your user>\AppData\Local\leap\systray.log`, `C:\Program Files\RiseupVPN\helper.log` & `C:\Program Files\RiseupVPN\openvp.log` diff --git a/pkg/bitmask/autostart.go b/pkg/bitmask/autostart.go index 1ba9162..9e37fe4 100644 --- a/pkg/bitmask/autostart.go +++ b/pkg/bitmask/autostart.go @@ -1,4 +1,3 @@ -// +build !bitmaskd // Copyright (C) 2018 LEAP // // This program is free software: you can redistribute it and/or modify |