From a1e2fc8995285485e54daf1deb0811e3bd77f264 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Tue, 26 Dec 2017 22:53:45 -0800 Subject: [PATCH 1/2] - Fixed build archive so that all files are included when a new build is generated. All builds should now have all the proper files as expected and run properly. --- gulpfile.js | 21 +++++++++++++-------- package.json | 2 ++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 7a2d88b8..30f14974 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -7,6 +7,8 @@ var argv = require('yargs') var del = require('del'); var detectCurrentPlatform = require('nw-builder/lib/detectCurrentPlatform.js'); var zip = require('gulp-zip'); +var gzip = require('gulp-gzip'); +var tar = require('gulp-tar'); var package = require('./package.json'); var nw = new NwBuilder({ @@ -36,20 +38,23 @@ gulp.task('clean', function() { gulp.task('zip', function () { - gulp.src('./build/Popcorn-Time-CE/osx64/*') - .pipe(zip('popcorn-time-ce_osx64_'+package.version+'.gz')) + gulp.src('./build/Popcorn-Time-CE/osx64/**/*') + .pipe(tar('popcorn-time-ce_osx64_'+package.version+'.tar')) + .pipe(gzip()) .pipe(gulp.dest('./dist')); - gulp.src('./build/Popcorn-Time-CE/win32/*') + gulp.src('./build/Popcorn-Time-CE/win32/**') .pipe(zip('popcorn-time-ce_win32_'+package.version+'.zip')) .pipe(gulp.dest('./dist')); - gulp.src('./build/Popcorn-Time-CE/win64/*') + gulp.src('./build/Popcorn-Time-CE/win64/**') .pipe(zip('popcorn-time-ce_win64_'+package.version+'.zip')) .pipe(gulp.dest('./dist')); - gulp.src('./build/Popcorn-Time-CE/linux32/*') - .pipe(zip('popcorn-time-ce_linux32_'+package.version+'.gz')) + gulp.src('./build/Popcorn-Time-CE/linux32/**') + .pipe(tar('popcorn-time-ce_linux32_'+package.version+'.tar')) + .pipe(gzip()) .pipe(gulp.dest('./dist')); - return gulp.src('./build/Popcorn-Time-CE/linux64/*') - .pipe(zip('popcorn-time-ce_linux64_'+package.version+'.gz')) + return gulp.src('./build/Popcorn-Time-CE/linux64/**') + .pipe(tar('popcorn-time-ce_linux64_'+package.version+'.tar')) + .pipe(gzip()) .pipe(gulp.dest('./dist')); }); diff --git a/package.json b/package.json index c468c600..e6e119d3 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,8 @@ "eslint-config-google": "^0.9.1", "gulp": "^3.9.1", "gulp-zip": "~4.0.0", + "gulp-gzip":"^1.4.0", + "gulp-tar": "^2.0.0", "nw-builder": "^3.5.1", "nw-gyp": "^3.4.0", "yargs": "^10.0.3" From 79cd5ab1806af2df71eb09108a726fd54240bf59 Mon Sep 17 00:00:00 2001 From: captainyarr Date: Tue, 26 Dec 2017 23:05:20 -0800 Subject: [PATCH 2/2] Bump version to 0.4.1-14 --- CHANGELOG.md | 10 ++++++++++ install | 2 +- package.json | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d100e2cc..1eb524fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 0.4.1-14 Beta - Lets start the New Year right... - 26 December 2017 + +New Features: + +- Packages are updated by Greenkeeper + +BugFixes: + +- Fixed build archive so that all files are included when a new build is generated. All builds should now have all the proper files as expected and run properly. +- Updated dependencies ## 0.4.1-11 Beta - Now with some butter - 6 December 2017 New Features: diff --git a/install b/install index e22ae1b5..5f4dca58 100755 --- a/install +++ b/install @@ -23,7 +23,7 @@ fi func_error #Variables -version="0.4.1-13" +version="0.4.1-14" tos="http://popcorn-time.is/tos.html" $path="$HOME/.Popcorn-Time-CE" diff --git a/package.json b/package.json index e6e119d3..a201ae40 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ }, "license": "GPL-3.0", "main": "src/app/index.html", - "version": "0.4.1-13", + "version": "0.4.1-14", "node-remote": "*://*", - "releaseName": "Now with some butter", + "releaseName": "Lets start the New Year right...", "scripts": { "start": "gulp run" },