From a14b4ac6507b65d9b2d5e22ff89cf89c689cd936 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Fri, 24 Apr 2020 18:57:01 +0200
Subject: [bug] do not use cross-compiling for the helper in win

- add -H windowsgui to avoid console popping up
---
 docker/Makefile   |  4 ++--
 docker/builder.sh | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'docker')

diff --git a/docker/Makefile b/docker/Makefile
index bdcc2b8..80ca9dd 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -14,10 +14,10 @@ package_win:
 	docker run \
 	    -e XBUILD=win \
 	    -e PROVIDER=riseup \
-	    -v `python3 -c 'import os; print(os.path.abspath(".."))'`:/bitmask-vpn.orig \
+	    -v `python3 -c 'import os; print(os.path.abspath(".."))'`:/bitmask-vpn.host \
 	    --cpus="4" \
 	    -it --rm \
 	    $(REGISTRY)/$(IMAGE):latest  \
 	    /builder.sh
 shell:
-	docker run -v `python3 -c 'import os; print(os.path.abspath(".."))'`:/bitmask-vpn.orig -it --rm $(REGISTRY)/$(IMAGE):latest  /bin/bash
+	docker run -v `python3 -c 'import os; print(os.path.abspath(".."))'`:/bitmask-vpn.host -it --rm $(REGISTRY)/$(IMAGE):latest  /bin/bash
diff --git a/docker/builder.sh b/docker/builder.sh
index dad7800..2767d61 100755
--- a/docker/builder.sh
+++ b/docker/builder.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 set -e
-export DESTDIR=/bitmask-vpn.orig/deploy/
-rm -rf /bitmask-vpn
-cp -r /bitmask-vpn.orig /bitmask-vpn
-cd /bitmask-vpn
+export HOSTDIR=/bitmask-vpn.host
+export GUESTDIR=/bitmask-vpn
+export DESTDIR="${HOSTDIR}"/deploy/
+rm -rf "${GUESTDIR}"
+cp -r "${HOSTDIR}" "${GUESTDIR}"
+cd "${GUESTDIR}"
 make prepare
 make build
 case $XBUILD in
@@ -17,4 +19,4 @@ case $XBUILD in
         make packages
         ;;
 esac
-cp  /bitmask-vpn/deploy/* $DESTDIR
+cp  "${GUESTDIR}"/deploy/* $DESTDIR
-- 
cgit v1.2.3