diff options
author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-08-13 16:31:41 -0300 |
---|---|---|
committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-08-13 16:31:41 -0300 |
commit | edbfa51c48bd5a32ca5b28e6aadccb0d20f6fac5 (patch) | |
tree | 8b7ec5170d036d838572adb074666e8709dd6232 | |
parent | ab1407d7fe764c7a51b8fa43f9e56fdd665cdbbf (diff) |
Remove unneeded hacks, comment pyinstaller clones.
Resolves: #7384
-rwxr-xr-x | bundle_pyinstaller.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bundle_pyinstaller.sh b/bundle_pyinstaller.sh index 44c1dd9..5a10a8a 100755 --- a/bundle_pyinstaller.sh +++ b/bundle_pyinstaller.sh @@ -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 |