From: Chocobozzz <florian.bigard@gmail.com>
Date: Sat, 1 Oct 2016 09:49:32 +0000 (+0200)
Subject: Electron-prebuilt -> electron
X-Git-Tag: v0.0.1-alpha~711
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=35165e1669f0525fbd1f6b41cf5dd076b326057b;p=github%2FChocobozzz%2FPeerTube.git

Electron-prebuilt -> electron
---

diff --git a/.travis.yml b/.travis.yml
index cf299f0e5..7b025f0b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ services:
 before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
 
 before_script:
-  - npm install electron-prebuilt -g
+  - npm install electron -g
   - npm run build
   - 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
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
         # 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
         # npm install -g npm@3
-        # npm install -g electron-prebuilt
+        # npm install -g electron
 
 #### Other distribution... (PR welcome)
 
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) {
 
     // Run a timeout of 30s after which we exit the process
     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)
 
     ipc.server.on(processKey + '.ready', function () {