Remove unneeded hacks, comment pyinstaller clones.
authorIvan Alejandro <ivanalejandro0@gmail.com>
Thu, 13 Aug 2015 19:31:41 +0000 (16:31 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Thu, 13 Aug 2015 19:31:41 +0000 (16:31 -0300)
Resolves: #7384

bundle_pyinstaller.sh

index 44c1dd9..5a10a8a 100755 (executable)
@@ -70,12 +70,15 @@ install_pyinstaller(){
     cd $REPOS_ROOT
 
     if [ ! -d pyinstaller ]; then
+        # git clone https://github.com/pyinstaller/pyinstaller.git --depth 1
+        # HACK: use kali's branch since a needed fix is not merged to upstream yet
         git clone https://github.com/kalikaneko/pyinstaller.git --branch feature/pyside-hooks --depth 1
         cd pyinstaller
     else
         cd pyinstaller
         git fetch origin
-        git reset --hard origin/develop
+        # git reset --hard origin/develop
+        git reset --hard feature/pyside-hooks  # just for kali's fork
     fi
 
     python setup.py develop
@@ -172,10 +175,6 @@ add_files(){
 
     _cdsitepackages
 
-    dest="$REPOS_ROOT/bitmask_client/pkg/pyinst/cryptography/"
-    mkdir -p $dest
-    cp cryptography/hazmat/bindings/openssl/src/osrandom_engine.{c,h} $dest
-
     dest="$REPOS_ROOT/bitmask_client/dist/bitmask/u1db/backends/"
     mkdir -p $dest
     cp u1db/backends/dbschema.sql $dest