[bug] ship leap.pixelated_www in bundles

- Resolves: #8993

2 files changed, 11 insertions, 10 deletions

diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh
index 7900a9d..d76c5b5 100755
--- a/pkg/build_bundle_with_venv.sh
+++ b/pkg/build_bundle_with_venv.sh
@@ -6,6 +6,10 @@
 ###########################################################
 # Stop bundling in case of errors
 set -e
+
+echo "BUILDING BITMASK BUNDLE..."
+git describe
+
 virtualenv venv
 source venv/bin/activate
 $VIRTUAL_ENV/bin/pip install appdirs packaging
@@ -16,17 +20,15 @@ $VIRTUAL_ENV/bin/pip install zope.interface zope.proxy
 # fix for #8789
 $VIRTUAL_ENV/bin/pip --no-cache-dir install pysqlcipher --install-option="--bundled"
 # FIXME pixelated needs some things but doesn't declare it
-$VIRTUAL_ENV/bin/pip install chardet whoosh
+$VIRTUAL_ENV/bin/pip install chardet
 # FIXME persuade pixelated to stop using requests in favor of treq
 $VIRTUAL_ENV/bin/pip install requests==2.11.1
 
 # For the Bitmask 0.10 bundles.
-$VIRTUAL_ENV/bin/pip install -U leap.soledad.common==0.9.6.post2
-$VIRTUAL_ENV/bin/pip install -U leap.soledad.client==0.9.6.post2
+$VIRTUAL_ENV/bin/pip install -U leap.soledad
 
 # CHANGE THIS IF YOU WANT A DIFFERENT BRANCH CHECKED OUT FOR COMMON/SOLEDAD --------------------
-#$VIRTUAL_ENV/bin/pip install -U leap.soledad.common --find-links https://devpi.net/kali/dev 
-#$VIRTUAL_ENV/bin/pip install -U leap.soledad.client --find-links https://devpi.net/kali/dev 
+#$VIRTUAL_ENV/bin/pip install -U leap.soledad --find-links https://devpi.net/kali/dev 
 # ----------------------------------------------------------------------------------------------
 
 # XXX hack for the namespace package not being properly handled by pyinstaller
@@ -40,8 +42,7 @@ $VIRTUAL_ENV/bin/pip uninstall --yes leap.bitmask
 $VIRTUAL_ENV/bin/python setup.py sdist bdist_wheel --universal
 $VIRTUAL_ENV/bin/pip install dist/*.whl
 
-# install pixelated from kali dev repo until assets get packaged.
-pip install pixelated-www pixelated-user-agent --find-links https://downloads.leap.se/libs/pixelated/
+pip install leap.pixelated-www leap.pixelated
 
 # Get the bundled libzmq
 $VIRTUAL_ENV/bin/pip uninstall --yes pyzmq
diff --git a/pkg/pyinst/build.mk b/pkg/pyinst/build.mk
index 6ee6821..c4906a2 100644
--- a/pkg/pyinst/build.mk
+++ b/pkg/pyinst/build.mk
@@ -18,7 +18,7 @@ bundle: bundle_clean
 	cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/soledad/client/_db/dbschema.sql $(DIST)/leap/soledad/client/_db/
 	cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST)/
 	cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/bitmask_js  $(DIST)/leap/
-	cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/pixelated_www  $(DIST)/
+	cp -r $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/pixelated_www  $(DIST)/leap/
 	mv $(DIST) _bundlelib && mkdir $(DIST_VERSION) && mv _bundlelib $(DIST_VERSION)/lib/
 	cd pkg/launcher && make
 	cp pkg/launcher/bitmask $(DIST_VERSION)
@@ -26,7 +26,7 @@ bundle: bundle_clean
 bundle_linux_gpg:
 	# TODO build it in a docker container!
 	mkdir -p $(DIST_VERSION)/apps/mail
-	cp /usr/bin/gpg $(DIST_VERSION)/apps/mail/
+	cp /usr/bin/gpg1 $(DIST_VERSION)/apps/mail/gpg
 	# workaround for missing libreadline.so.6 in fresh ubuntu
 	patchelf --set-rpath '.' $(DIST_VERSION)/apps/mail/gpg
 	cp /lib/x86_64-linux-gnu/libusb-0.1.so.4 $(DIST_VERSION)/lib
@@ -40,7 +40,7 @@ bundle_linux_helpers:
 	mkdir -p $(DIST_VERSION)/apps/helpers
 	cp src/leap/bitmask/vpn/helpers/linux/bitmask-root $(DIST_VERSION)/apps/helpers/
 	cp src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.bundle.policy $(DIST_VERSION)/apps/helpers/
-	cp /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2.0 $(DIST_VERSION)/lib/libGL.so.1
+	cp /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2.0 $(DIST_VERSION)/lib/libGL.so.1 || echo "libGL version not found"
 
 bundle_osx_helpers:
 	mkdir -p $(DIST_VERSION)/apps/helpers