interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Electron-prebuilt -> electron

This commit is contained in:
Chocobozzz 2016-10-01 11:49:32 +02:00
parent 10d0963eec
commit 35165e1669
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -22,7 +22,7 @@ services:
before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
before_script: before_script:
- npm install electron-prebuilt -g - npm install electron -g
- npm run build - npm run build
- wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-3.0.2-64bit-static.tar.xz" - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-3.0.2-64bit-static.tar.xz"
- tar xf ffmpeg-release-3.0.2-64bit-static.tar.xz - tar xf ffmpeg-release-3.0.2-64bit-static.tar.xz

2
README.md
View File

@ -127,7 +127,7 @@ Thanks to [WebTorrent](https://github.com/feross/webtorrent), we can make P2P (t
# apt-get update # apt-get update
# apt-get install ffmpeg mongodb openssl xvfb curl sudo git build-essential libgtk2.0-0 libgconf-2-4 libnss3 libasound2 libxtst6 libxss1 libnotify-bin # apt-get install ffmpeg mongodb openssl xvfb curl sudo git build-essential libgtk2.0-0 libgconf-2-4 libnss3 libasound2 libxtst6 libxss1 libnotify-bin
# npm install -g npm@3 # npm install -g npm@3
# npm install -g electron-prebuilt # npm install -g electron
#### Other distribution... (PR welcome) #### Other distribution... (PR welcome)

2
server/lib/webtorrent.js
View File

@ -43,7 +43,7 @@ function create (options, callback) {
// Run a timeout of 30s after which we exit the process // Run a timeout of 30s after which we exit the process
const timeoutWebtorrentProcess = setTimeout(function () { const timeoutWebtorrentProcess = setTimeout(function () {
throw new Error('Timeout : cannot run the webtorrent process. Please ensure you have electron-prebuilt npm package installed with xvfb-run.') throw new Error('Timeout : cannot run the webtorrent process. Please ensure you have electron npm package installed with xvfb-run.')
}, 30000) }, 30000)
ipc.server.on(processKey + '.ready', function () { ipc.server.on(processKey + '.ready', function () {