aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--package.json1
-rwxr-xr-xscripts/help.sh1
-rwxr-xr-xscripts/upgrade.sh16
-rw-r--r--server.js2
4 files changed, 20 insertions, 0 deletions
diff --git a/package.json b/package.json
index 8e2163bb2..93c748cd3 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
31 "dev": "scripty", 31 "dev": "scripty",
32 "start": "node server", 32 "start": "node server",
33 "check": "scripty", 33 "check": "scripty",
34 "upgrade": "scripty",
34 "test": "scripty", 35 "test": "scripty",
35 "help": "scripty", 36 "help": "scripty",
36 "postinstall": "cd client && npm install" 37 "postinstall": "cd client && npm install"
diff --git a/scripts/help.sh b/scripts/help.sh
index fdccabbf0..23c460afa 100755
--- a/scripts/help.sh
+++ b/scripts/help.sh
@@ -16,5 +16,6 @@ printf " play -> Run 3 fresh nodes so that you can test the com
16printf " dev -> Watch, run the livereload and run the server so that you can develop the application\n" 16printf " dev -> Watch, run the livereload and run the server so that you can develop the application\n"
17printf " start -> Run the server\n" 17printf " start -> Run the server\n"
18printf " check -> Check the server (according to NODE_ENV)\n" 18printf " check -> Check the server (according to NODE_ENV)\n"
19printf " upgrade -- [branch] -> Upgrade the application according to the [branch] parameter\n"
19printf " test -> Run the tests\n" 20printf " test -> Run the tests\n"
20printf " help -> Print this help\n" 21printf " help -> Print this help\n"
diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
new file mode 100755
index 000000000..1299ac55a
--- /dev/null
+++ b/scripts/upgrade.sh
@@ -0,0 +1,16 @@
1#!/usr/bin/env sh
2
3
4git pull origin $(git rev-parse --abbrev-ref HEAD) || exit -1
5
6if [[ `pgrep peertube` > /dev/null ]]; then
7 echo 'PeerTube is running!'
8 exit 0
9fi
10
11npm install
12npm update
13cd client && npm update && cd ../
14npm run build
15
16echo "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts."
diff --git a/server.js b/server.js
index d540c301b..d866f628c 100644
--- a/server.js
+++ b/server.js
@@ -11,6 +11,8 @@ const path = require('path')
11const TrackerServer = require('bittorrent-tracker').Server 11const TrackerServer = require('bittorrent-tracker').Server
12const WebSocketServer = require('ws').Server 12const WebSocketServer = require('ws').Server
13 13
14process.title = 'peertube'
15
14// Create our main app 16// Create our main app
15const app = express() 17const app = express()
16 18