diff options
| author | Kali Kaneko <kali@leap.se> | 2018-02-15 20:19:50 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2018-02-15 22:55:44 +0100 |
| commit | 4f43bd267e2f8d80c1860a4cda2ffb142bb2df99 (patch) | |
| tree | a3894287f67cd0726114d75d422eff9de93beec9 /pkg | |
| parent | 0388014636ce25fd1786c8bb79727dd643604f11 (diff) | |
[pkg] update systray before building
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/bundle_riseupvpn_from_docker | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/bundle_riseupvpn_from_docker b/pkg/bundle_riseupvpn_from_docker index 006a788a..0c8f3163 100644 --- a/pkg/bundle_riseupvpn_from_docker +++ b/pkg/bundle_riseupvpn_from_docker @@ -8,15 +8,15 @@ # build bitmask-systray # (dependencies should already be in the base image) +export SYSTRAY_SRC=/srv/go/src/0xacab.org/leap/bitmask-systray/ export GOPATH=/srv/go export CGO_CPPFLAGS="-I/usr/include" export CGO_LDFLAGS="-L/usr/lib -L/usr/lib/z86_64-linux-gnu -lzmq -lpthread -lsodium -lrt -lstdc++ -lm -lc -lgcc" -# echo "[+] building systray deps" -# go get -a 0xacab.org/leap/bitmask-systray -cd /src/leap && git clone --depth 1 --single-branch --branch master https://0xacab.org/leap/bitmask-systray echo "[+] building systray" -cd bitmask-systray && go build . +cd ${SYSTRAY_SRC} +git pull +go build . cd $HOME echo "[+] CLONING REPO from $REPO [$BRANCH]" @@ -39,7 +39,7 @@ VIRTUAL_ENV=/usr/local make bundle_anonvpn_linux # copy systray binary and libs echo "[+] Copy systray binary" -cp /src/leap/bitmask-systray/bitmask-systray dist/${RELEASE}/lib/ +cp ${SYSTRAY_SRC}/bitmask-systray dist/${RELEASE}/lib/ cp /usr/lib/x86_64-linux-gnu/libsodium.so.18 dist/${RELEASE}/lib/ cp /usr/lib/x86_64-linux-gnu/libzmq.so.5.1.1 dist/${RELEASE}/lib/libzmq.so.5 cp /usr/lib/x86_64-linux-gnu/libappindicator3.so.1 dist/${RELEASE}/lib/ |