From 38191978088919124258a07f6e2c2ce4bd224016 Mon Sep 17 00:00:00 2001
From: "Matthew D. Scholefield" <matthew3311999@gmail.com>
Date: Fri, 23 Feb 2018 15:43:54 -0600
Subject: [PATCH] Change build to folder

---
 precise.stream.spec | 20 ++++++++++++--------
 publish.sh          | 10 +++++++---
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/precise.stream.spec b/precise.stream.spec
index 4c34130..2596b31 100644
--- a/precise.stream.spec
+++ b/precise.stream.spec
@@ -1,12 +1,11 @@
 # -*- mode: python -*-
 block_cipher = None
 
-
 a = Analysis(['precise/scripts/stream.py'],
              pathex=['.'],
              binaries=[],
              datas=[],
-             hiddenimports=[],
+             hiddenimports=['prettyparse'],
              hookspath=[],
              runtime_hooks=[],
              excludes=['PySide', 'PyQt4', 'PyQt5', 'matplotlib'],
@@ -15,16 +14,21 @@ a = Analysis(['precise/scripts/stream.py'],
              cipher=block_cipher)
 
 pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
+          cipher=block_cipher)
 
 exe = EXE(pyz,
           a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,
+          exclude_binaries=True,
           name='precise-stream',
           debug=False,
           strip=True,
           upx=True,
-          runtime_tmpdir=None,
-          console=True )
+          console=True,)
+
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=True,
+               upx=True,
+               name='precise-stream')
diff --git a/publish.sh b/publish.sh
index 66fd5dc..1fecd2e 100755
--- a/publish.sh
+++ b/publish.sh
@@ -69,15 +69,19 @@ version="$(find_version $build_type)"
 arch="$(find_arch)"
 
 sudo pip3 install pyinstaller
+rm -rf dist/
 pyinstaller -y precise.stream.spec
 
+out_file=dist/precise-stream.tar.gz
+tar -czvf "$out_file" data/precise-stream/
+
 echo $version > latest
 
 if [ "$upload_type" = "git" ]; then
-	upload_git dist/precise-stream $arch/
+	upload_git "$out_file" $arch/
 else
-	upload_s3 dist/precise-stream bootstrap.mycroft.ai/artifacts/static/$type/$arch/$version/
-	upload_s3 dist/precise-stream bootstrap.mycroft.ai/artifacts/static/$type/$arch/  # Replace latest version
+	upload_s3 "$out_file" bootstrap.mycroft.ai/artifacts/static/$type/$arch/$version/
+	upload_s3 "$out_file" bootstrap.mycroft.ai/artifacts/static/$type/$arch/  # Replace latest version
 	upload_s3 latest bootstrap.mycroft.ai/artifacts/static/$type/$arch/
 fi