diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2016-07-01 16:22:36 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2016-07-01 16:22:36 +0200 |
| commit | 5f698b82c7055df763f3830882ac5bad1397db23 (patch) | |
| tree | 97e2e8178a5c7eec8e8f0e0cfce9cff399452cdc /server/lib | |
| parent | fc51fde048f2c3ce1dd3e85f5528335040bae894 (diff) | |
| download | PeerTube-5f698b82c7055df763f3830882ac5bad1397db23.tar.gz PeerTube-5f698b82c7055df763f3830882ac5bad1397db23.tar.zst PeerTube-5f698b82c7055df763f3830882ac5bad1397db23.zip | |
Use dashes for filenames
Diffstat (limited to 'server/lib')
| -rw-r--r-- | server/lib/friends.js | 2 | ||||
| -rw-r--r-- | server/lib/webtorrent-process.js (renamed from server/lib/webtorrentProcess.js) | 0 | ||||
| -rw-r--r-- | server/lib/webtorrent.js | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/server/lib/friends.js b/server/lib/friends.js index a93467c13..a85f4e19a 100644 --- a/server/lib/friends.js +++ b/server/lib/friends.js | |||
| @@ -8,7 +8,7 @@ const request = require('request') | |||
| 8 | 8 | ||
| 9 | const constants = require('../initializers/constants') | 9 | const constants = require('../initializers/constants') |
| 10 | const logger = require('../helpers/logger') | 10 | const logger = require('../helpers/logger') |
| 11 | const peertubeCrypto = require('../helpers/peertubeCrypto') | 11 | const peertubeCrypto = require('../helpers/peertube-crypto') |
| 12 | const requests = require('../helpers/requests') | 12 | const requests = require('../helpers/requests') |
| 13 | 13 | ||
| 14 | const http = config.get('webserver.https') ? 'https' : 'http' | 14 | const http = config.get('webserver.https') ? 'https' : 'http' |
diff --git a/server/lib/webtorrentProcess.js b/server/lib/webtorrent-process.js index be7ac5bb4..be7ac5bb4 100644 --- a/server/lib/webtorrentProcess.js +++ b/server/lib/webtorrent-process.js | |||
diff --git a/server/lib/webtorrent.js b/server/lib/webtorrent.js index fe2ee357f..9960737f2 100644 --- a/server/lib/webtorrent.js +++ b/server/lib/webtorrent.js | |||
| @@ -57,7 +57,7 @@ function create (options, callback) { | |||
| 57 | throw new Error('Received exception error from webtorrent process : ' + data.exception) | 57 | throw new Error('Received exception error from webtorrent process : ' + data.exception) |
| 58 | }) | 58 | }) |
| 59 | 59 | ||
| 60 | const webtorrentProcess = spawn(pathUtils.join(__dirname, 'webtorrentProcess.js'), host, port, { detached: true }) | 60 | const webtorrentProcess = spawn(pathUtils.join(__dirname, 'webtorrent-process.js'), host, port, { detached: true }) |
| 61 | 61 | ||
| 62 | if (electronDebug === true) { | 62 | if (electronDebug === true) { |
| 63 | webtorrentProcess.stderr.on('data', function (data) { | 63 | webtorrentProcess.stderr.on('data', function (data) { |