updated build to push zip files to bintray instead of s3

.travis.yml

@@ -7,6 +7,8 @@ before_install:
 script:
 - ./scripts/makeportable.sh "${TRAVIS_TAG:-master}" win32
 - ./scripts/makeportable.sh "${TRAVIS_TAG:-master}" amd64
+before_deploy:
+- ./scripts/bintrayconfig.sh
 deploy:
   - provider: releases
     api_key: "${RELEASES_API_KEY}"
@@ -15,25 +17,10 @@ deploy:
     skip_cleanup: true
     on:
       tags: true
-  - provider: s3
+  - provider: bintray
+    file: build/bintray-nightly.json
+    user: "${BINTRAY_USER}"
+    key: "${BINTRAY_KEY}"
     skip_cleanup: true
-    local_dir: dist/nightly
-    bucket: streamlink-portable
-    upload-dir: nightly
     on:
       branch: master
-    secret_access_key:
-      secure: Tu+620haTds+lV0ycSi+xPZI46oFxBcC03CXO1Si6QkB44bx3zrYna7vojKfFFow78uoe3oBuRNKDh/MtAQQ/aH4rmqkOrDLRECyOqb3A3kVy20rTZdCiCVTDsHfvOXZo87/a4/cjiZm3B+vVqoVzxEdlzA93ofdKMCgU6OiSF1KZmdQ/i0T4hbCzhRsUGR8LEeug7s8mvvLx9/rv1rfQ4Z9anHovFvjgcJkhCQE4DC+y+nj0VvGMNLHnUbECa1v6Z07SpoFqwV7IrMH48oo2KvDb0JK9YssC/EWEtwG06eITPU7xMsUWeTUcp2rv7t8OEtQ6X+9YyWHoC7ljEwjxTg4lsrAPKV4jtW9N+tj/lmH2hKSmgmgUdNZ+tbJARqnuvP34hxf3VRvQKgqXUkogRv8fBeBCxh8MNWpQcAoNlDBh/B2mdujXlgTiy/0wHOQl/5hVUIqIdD/53OAJonvm6cKKgDr8uTg9d1a7S7gU1LwqIHNxalRLhQUUiuUzGDYCUyLsyg6kguEuWzgX3ky8dbnD41pip9SRJqaZJSh1CSMfduTpBNG7DEfDnFi8Xg+fx6/yNoUjDJQv4gcw14ZANIMzP5W1vxrqkZ04dyCA3sIq1DS/kHqcV5QsVn7dW2bnF5DIdTaShAmPOEk0x4HwWLqAl4UlCHgfU63av79PO4=
-    access_key_id:
-      secure: oGgHiDOjoKkEIp4rU0uQCNABOt5pCpQRDNxgyH+QsLj3Yoil8zjQjybTpB7iaR4vvofbF3ZjvecmwRva28qPC/hmSFpXhBpuyQuRTvlszXvjF69tQ36BIlOiW4mCCj2zDKQqRJoinYg03Xa/yeBrIw34z8MB0SoAYKM0M7qQ+66umy1NZ+QDnfZzj1Flvii9HvQ0MPqCENMXPl6mm+LDA0g5qxfrFnHJDsqszcttFSvDiy47/7SpotbObTnH5PLgCdQTKlOZgT4HHAfGWRTYLxVxA1diFRuT5kIWE8G9eMMvwv01Yt3UgeQTktl0MRpTwkIZMOz0FtnsD3OndaGh/laUbB0RoE8oSlPIpoGPHYDu1GiByvvinUltI11rYO2F+a587Ue6DZi0W3CZ8RKAxvsCF1IfjFmYkl/p+pKmI4qyZEffGcB4cu2RyBV3dZYtBYJ+fa4kGi1YWOQR9+qwfTVFwn040XbVe2z2yO37UPjzS4Po2XGn87nEefh+S9C/X4+g0EoMDxqwoVrAQARnXAIr01YkJDzYPvT5exF0UqA33E6M1qMW+Q2Q0AHg+zErvhZZqmTEra7ETX/YceYjkaJkG1Oz7RGL+efg8DW43BU6O7jeljCcwuD64xy9x0Qpr/T2936dFpb1FXVnJt4ezTvYK7u55VgiWVmo97fpByA=
-  - provider: s3
-    skip_cleanup: true
-    local_dir: dist/stable
-    bucket: streamlink-portable
-    upload-dir: stable
-    on:
-      tags: true
-    secret_access_key:
-      secure: Tu+620haTds+lV0ycSi+xPZI46oFxBcC03CXO1Si6QkB44bx3zrYna7vojKfFFow78uoe3oBuRNKDh/MtAQQ/aH4rmqkOrDLRECyOqb3A3kVy20rTZdCiCVTDsHfvOXZo87/a4/cjiZm3B+vVqoVzxEdlzA93ofdKMCgU6OiSF1KZmdQ/i0T4hbCzhRsUGR8LEeug7s8mvvLx9/rv1rfQ4Z9anHovFvjgcJkhCQE4DC+y+nj0VvGMNLHnUbECa1v6Z07SpoFqwV7IrMH48oo2KvDb0JK9YssC/EWEtwG06eITPU7xMsUWeTUcp2rv7t8OEtQ6X+9YyWHoC7ljEwjxTg4lsrAPKV4jtW9N+tj/lmH2hKSmgmgUdNZ+tbJARqnuvP34hxf3VRvQKgqXUkogRv8fBeBCxh8MNWpQcAoNlDBh/B2mdujXlgTiy/0wHOQl/5hVUIqIdD/53OAJonvm6cKKgDr8uTg9d1a7S7gU1LwqIHNxalRLhQUUiuUzGDYCUyLsyg6kguEuWzgX3ky8dbnD41pip9SRJqaZJSh1CSMfduTpBNG7DEfDnFi8Xg+fx6/yNoUjDJQv4gcw14ZANIMzP5W1vxrqkZ04dyCA3sIq1DS/kHqcV5QsVn7dW2bnF5DIdTaShAmPOEk0x4HwWLqAl4UlCHgfU63av79PO4=
-    access_key_id:
-      secure: oGgHiDOjoKkEIp4rU0uQCNABOt5pCpQRDNxgyH+QsLj3Yoil8zjQjybTpB7iaR4vvofbF3ZjvecmwRva28qPC/hmSFpXhBpuyQuRTvlszXvjF69tQ36BIlOiW4mCCj2zDKQqRJoinYg03Xa/yeBrIw34z8MB0SoAYKM0M7qQ+66umy1NZ+QDnfZzj1Flvii9HvQ0MPqCENMXPl6mm+LDA0g5qxfrFnHJDsqszcttFSvDiy47/7SpotbObTnH5PLgCdQTKlOZgT4HHAfGWRTYLxVxA1diFRuT5kIWE8G9eMMvwv01Yt3UgeQTktl0MRpTwkIZMOz0FtnsD3OndaGh/laUbB0RoE8oSlPIpoGPHYDu1GiByvvinUltI11rYO2F+a587Ue6DZi0W3CZ8RKAxvsCF1IfjFmYkl/p+pKmI4qyZEffGcB4cu2RyBV3dZYtBYJ+fa4kGi1YWOQR9+qwfTVFwn040XbVe2z2yO37UPjzS4Po2XGn87nEefh+S9C/X4+g0EoMDxqwoVrAQARnXAIr01YkJDzYPvT5exF0UqA33E6M1qMW+Q2Q0AHg+zErvhZZqmTEra7ETX/YceYjkaJkG1Oz7RGL+efg8DW43BU6O7jeljCcwuD64xy9x0Qpr/T2936dFpb1FXVnJt4ezTvYK7u55VgiWVmo97fpByA=

README.md

@@ -4,12 +4,12 @@ A script to build a portable version of Streamlink for Windows.
 The portable zip files are build from the master branch of [streamlink/streamlink](https://github.com/streamlink/streamlink) and come bundled with Python 3.5.2. There is a 32 bit and a 64 bit version available for 32 bit Windows and 64 bit Windows (if in doubt use the 32 bit version).
 
 The latest versions of the portable zips can be downloaded here:
-- [streamlink-portable-latest-win32.zip](https://s3.amazonaws.com/streamlink-portable/nightly/streamlink-portable-latest-win32.zip)
-- [streamlink-portable-latest-amd64.zip](https://s3.amazonaws.com/streamlink-portable/nightly/streamlink-portable-latest-amd64.zip)
+- [streamlink-portable-latest-win32.zip](https://dl.bintray.com/beardypig/streamlink-portable/streamlink-portable-latest-win32.zip)
+- [streamlink-portable-latest-amd64.zip](https://dl.bintray.com/beardypig/streamlink-portable/streamlink-portable-latest-amd64.zip)
 
 A stable version is also available, based on the `0.5.0` tag of streamlink:
-- [streamlink-portable-0.5.0-py3.5.2-win32.zip](https://s3.amazonaws.com/streamlink-portable/stable/streamlink-portable-0.5.0-py3.5.2-win32.zip)
-- [streamlink-portable-0.5.0-py3.5.2-amd64.zip](https://s3.amazonaws.com/streamlink-portable/stable/streamlink-portable-0.5.0-py3.5.2-amd64.zip)
+- [streamlink-portable-0.5.0-py3.5.2-win32.zip](https://github.com/beardypig/streamlink-portable/releases/download/0.5.0/streamlink-portable-0.5.0-py3.5.2-win32.zip)
+- [streamlink-portable-0.5.0-py3.5.2-amd64.zip](https://github.com/beardypig/streamlink-portable/releases/download/0.5.0/streamlink-portable-0.5.0-py3.5.2-amd64.zip)
 
 To install simply unzip the zip file.
 

scripts/bintrayconfig.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+#
+# Script to generate bintray config for portable builds
+#
+STREAMLINK_PYTHON_VERSION=3.5.3
+
+root_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+build_dir="${root_dir}/build/"
+mkdir -p ${build_dir}
+
+echo "Building nightly/dev version..."
+cat > "${build_dir}/bintray-nightly.json" <<EOF
+{
+"package": {
+"subject": "beardypig",
+"repo": "streamlink-portable",
+"name": "streamlink-portable"
+},
+
+"version": {
+"name": "latest",
+"released": "$(date +'%Y-%m-%d')"
+},
+
+"files": [
+{
+  "includePattern": "${dist_dir}/(streamlink-portable-latest-.*\\.zip)",
+  "uploadPattern": "\$1",
+  "matrixParams": {
+    "override": 1,
+    "publish": 1
+  }
+}
+],
+
+"publish": true
+}
+EOF
+
+echo "Wrote Bintray config to: ${build_dir}/bintray-nightly.json"

scripts/makeportable.sh

@@ -7,7 +7,7 @@ set -e # quit on error
 
 branch=${1:-master}
 STREAMLINK_PYTHON_ARCH=${2:-win32}
-STREAMLINK_PYTHON_VERSION=3.5.2
+STREAMLINK_PYTHON_VERSION=3.5.3
 PYTHON_PLATFORM=${STREAMLINK_PYTHON_ARCH}
 
 if [[ "${STREAMLINK_PYTHON_ARCH}" == "amd64" ]]; then