Merge branch 'release/0.4.1-14'

captainyarr · Dec 27, 2017 · a2888f1 · a2888f1
2 parents 199e7cd + 79cd5ab
commit a2888f1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 11 deletions.
diff --git 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/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/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
@@ -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"
     },
@@ -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"