Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
bitmask-vpn
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julian Merlin
bitmask-vpn
Commits
a18e61aa
Unverified
Commit
a18e61aa
authored
4 years ago
by
Kali Kaneko
Browse files
Options
Downloads
Patches
Plain Diff
[docs] remove references to deprecated bitmaskd
parent
1678e257
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+4
-10
4 additions, 10 deletions
Makefile
README.md
+1
-1
1 addition, 1 deletion
README.md
pkg/bitmask/autostart.go
+0
-1
0 additions, 1 deletion
pkg/bitmask/autostart.go
with
5 additions
and
12 deletions
Makefile
+
4
−
10
View file @
a18e61aa
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
README.md
+
1
−
1
View file @
a18e61aa
...
...
@@ -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`
This diff is collapsed.
Click to expand it.
pkg/bitmask/autostart.go
+
0
−
1
View file @
a18e61aa
// +build !bitmaskd
// Copyright (C) 2018 LEAP
//
// This program is free software: you can redistribute it and/or modify
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment