diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-07-23 09:40:28 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-07-23 09:43:44 +0200 |
commit | 407c4473ad6b1aa30c3d77bd75e3c273d03989b8 (patch) | |
tree | d933d6b4dcd04c131cd245c92eca13ad9f3127a6 | |
parent | d063f8ca92070103ea1847cf8607ecae93e679ba (diff) | |
download | PeerTube-407c4473ad6b1aa30c3d77bd75e3c273d03989b8.tar.gz PeerTube-407c4473ad6b1aa30c3d77bd75e3c273d03989b8.tar.zst PeerTube-407c4473ad6b1aa30c3d77bd75e3c273d03989b8.zip |
Fix upgrade script \n
-rw-r--r-- | .gitignore | 1 | ||||
-rwxr-xr-x | scripts/upgrade-peertube.sh | 2 | ||||
-rw-r--r-- | server.ts | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 169027c36..42d4f5926 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -18,3 +18,4 @@ | |||
18 | /*.sublime-project | 18 | /*.sublime-project |
19 | /*.sublime-workspace | 19 | /*.sublime-workspace |
20 | /dist | 20 | /dist |
21 | /.idea | ||
diff --git a/scripts/upgrade-peertube.sh b/scripts/upgrade-peertube.sh index f7b856470..5186a269f 100755 --- a/scripts/upgrade-peertube.sh +++ b/scripts/upgrade-peertube.sh | |||
@@ -35,4 +35,4 @@ git pull origin $(git rev-parse --abbrev-ref HEAD) || exit -1 | |||
35 | yarn install --pure-lockfile | 35 | yarn install --pure-lockfile |
36 | npm run build | 36 | npm run build |
37 | 37 | ||
38 | echo "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts." | 38 | echo -e "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts." |
@@ -24,7 +24,7 @@ process.title = 'peertube' | |||
24 | const app = express() | 24 | const app = express() |
25 | 25 | ||
26 | // ----------- Database ----------- | 26 | // ----------- Database ----------- |
27 | // Do not use barels because we don't want to load all modules here (we need to initialize database first) | 27 | // Do not use barrels because we don't want to load all modules here (we need to initialize database first) |
28 | import { logger } from './server/helpers/logger' | 28 | import { logger } from './server/helpers/logger' |
29 | import { API_VERSION, CONFIG } from './server/initializers/constants' | 29 | import { API_VERSION, CONFIG } from './server/initializers/constants' |
30 | // Initialize database and models | 30 | // Initialize database and models |
@@ -55,7 +55,7 @@ import { apiRouter, clientsRouter, staticRouter } from './server/controllers' | |||
55 | 55 | ||
56 | // ----------- App ----------- | 56 | // ----------- App ----------- |
57 | 57 | ||
58 | // Enable cors for develop | 58 | // Enable CORS for develop |
59 | if (isTestInstance()) { | 59 | if (isTestInstance()) { |
60 | app.use(cors({ | 60 | app.use(cors({ |
61 | origin: 'http://localhost:3000', | 61 | origin: 'http://localhost:3000', |