From 407c4473ad6b1aa30c3d77bd75e3c273d03989b8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sun, 23 Jul 2017 09:40:28 +0200 Subject: Fix upgrade script \n --- .gitignore | 1 + scripts/upgrade-peertube.sh | 2 +- 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 @@ /*.sublime-project /*.sublime-workspace /dist +/.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 yarn install --pure-lockfile npm run build -echo "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts." +echo -e "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts." diff --git a/server.ts b/server.ts index a6a9fcb02..1ba208c28 100644 --- a/server.ts +++ b/server.ts @@ -24,7 +24,7 @@ process.title = 'peertube' const app = express() // ----------- Database ----------- -// Do not use barels because we don't want to load all modules here (we need to initialize database first) +// Do not use barrels because we don't want to load all modules here (we need to initialize database first) import { logger } from './server/helpers/logger' import { API_VERSION, CONFIG } from './server/initializers/constants' // Initialize database and models @@ -55,7 +55,7 @@ import { apiRouter, clientsRouter, staticRouter } from './server/controllers' // ----------- App ----------- -// Enable cors for develop +// Enable CORS for develop if (isTestInstance()) { app.use(cors({ origin: 'http://localhost:3000', -- cgit v1.2.3