aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-10-01 11:49:32 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-10-01 11:49:32 +0200
commit35165e1669f0525fbd1f6b41cf5dd076b326057b (patch)
treeb59bda629cf5209f34ef71c9f6552639bfa94d95
parent10d0963eec1c9ae6d534e5eecb34ec807596d4a9 (diff)
downloadPeerTube-35165e1669f0525fbd1f6b41cf5dd076b326057b.tar.gz
PeerTube-35165e1669f0525fbd1f6b41cf5dd076b326057b.tar.zst
PeerTube-35165e1669f0525fbd1f6b41cf5dd076b326057b.zip
Electron-prebuilt -> electron
-rw-r--r--.travis.yml2
-rw-r--r--README.md2
-rw-r--r--server/lib/webtorrent.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index cf299f0e5..7b025f0b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ services:
22before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi 22before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
23 23
24before_script: 24before_script:
25 - npm install electron-prebuilt -g 25 - npm install electron -g
26 - npm run build 26 - npm run build
27 - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-3.0.2-64bit-static.tar.xz" 27 - wget --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-3.0.2-64bit-static.tar.xz"
28 - tar xf ffmpeg-release-3.0.2-64bit-static.tar.xz 28 - tar xf ffmpeg-release-3.0.2-64bit-static.tar.xz
diff --git a/README.md b/README.md
index a83bfe7be..975ec1695 100644
--- a/README.md
+++ b/README.md
@@ -127,7 +127,7 @@ Thanks to [WebTorrent](https://github.com/feross/webtorrent), we can make P2P (t
127 # apt-get update 127 # apt-get update
128 # apt-get install ffmpeg mongodb openssl xvfb curl sudo git build-essential libgtk2.0-0 libgconf-2-4 libnss3 libasound2 libxtst6 libxss1 libnotify-bin 128 # apt-get install ffmpeg mongodb openssl xvfb curl sudo git build-essential libgtk2.0-0 libgconf-2-4 libnss3 libasound2 libxtst6 libxss1 libnotify-bin
129 # npm install -g npm@3 129 # npm install -g npm@3
130 # npm install -g electron-prebuilt 130 # npm install -g electron
131 131
132#### Other distribution... (PR welcome) 132#### Other distribution... (PR welcome)
133 133
diff --git a/server/lib/webtorrent.js b/server/lib/webtorrent.js
index 2090b792b..dde046828 100644
--- a/server/lib/webtorrent.js
+++ b/server/lib/webtorrent.js
@@ -43,7 +43,7 @@ function create (options, callback) {
43 43
44 // Run a timeout of 30s after which we exit the process 44 // Run a timeout of 30s after which we exit the process
45 const timeoutWebtorrentProcess = setTimeout(function () { 45 const timeoutWebtorrentProcess = setTimeout(function () {
46 throw new Error('Timeout : cannot run the webtorrent process. Please ensure you have electron-prebuilt npm package installed with xvfb-run.') 46 throw new Error('Timeout : cannot run the webtorrent process. Please ensure you have electron npm package installed with xvfb-run.')
47 }, 30000) 47 }, 30000)
48 48
49 ipc.server.on(processKey + '.ready', function () { 49 ipc.server.on(processKey + '.ready', function () {