Skip to content

Commit

Permalink
Some Butter project conversion from old project
Browse files Browse the repository at this point in the history
  • Loading branch information
hadim committed Oct 23, 2015
1 parent 9ff7755 commit 7e7b8ab
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
cache/
lib-cov
*.seed
*.log
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

8 changes: 4 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = function (grunt) {
]);

grunt.registerTask('themes', [
'shell:themes',
/*'shell:themes',*/
'clean:css',
'stylus:official',
'stylus:third_party'
Expand All @@ -75,7 +75,7 @@ module.exports = function (grunt) {
grunt.registerTask('build', [
'injectgit',
'bower_clean',
'lang',
/*'lang',*/
'themes',
'nwjs',
'shell:setexecutable'
Expand Down Expand Up @@ -236,7 +236,7 @@ module.exports = function (grunt) {
cmd: '"build/cache/linux32/<%= nwjs.options.version %>/nw" .'
},
linux64: {
cmd: '"build/cache/linux64/<%= nwjs.options.version %>/nw" .'
cmd: '"build/' + projectName + '/linux64/' + projectName + '" .'
},
codesign: {
cmd: 'sh dist/mac/codesign.sh || echo "Codesign failed, likely caused by not being run on mac, continuing"'
Expand Down Expand Up @@ -464,7 +464,7 @@ module.exports = function (grunt) {
},

clean: {
releases: ['build/releases/' + projectName + '/**'],
releases: ['build/' + projectName + '/**'],
css: ['src/app/themes/**'],
dist: ['dist/windows/*-Setup.exe', 'dist/mac/*.dmg'],
update: ['build/updater/*.*'],
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
},
"dependencies": {
"adm-zip": "0.4.7",
"airplay-js": "git+https://git.popcorntime.io/mirrors/node-airplay-js.git",
"airplay-js": "git+https://github.com/guerrerocarlos/node-airplay-js.git",
"async": "0.9.0",
"chromecast-js": "git+https://git.popcorntime.io/mirrors/chromecast-js.git",
"chromecast-js": "git+https://github.com/guerrerocarlos/chromecast-js.git",
"gitlab": "1.3.0",
"i18n": "0.5.0",
"iconv-lite": "0.x.x",
Expand All @@ -44,11 +44,11 @@
"mv": "2.x.x",
"nedb": "1.1.2",
"node-captions": "0.3.8",
"nodecast-js": "git+https://git.popcorntime.io/mirrors/nodecast-js.git",
"nodecast-js": "git+https://github.com/gyzerok/nodecast-js",
"node-tvdb": "1.3.1",
"node-webkit-fdialogs": "latest",
"os-name": "1.x.x",
"peerflix": "git+https://git.popcorntime.io/mirrors/peerflix.git",
"peerflix": "git+https://github.com/mafintosh/peerflix.git",
"opensubtitles-api": "1.x.x",
"q": "2.0.3",
"read-torrent": "1.3.0",
Expand Down

0 comments on commit 7e7b8ab

Please sign in to comment.