X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fdev%2Fclient.sh;h=e9cade800571f657dddc6338cba944f1b89dcb79;hb=caf2aaf4f9d38ad441a5562c3b8720f8779d6f78;hp=cdcf29ef2761f76d5efcbba3d9324e2f55956b94;hpb=9b7668f527fce8981f4684ed0459b62e740b4b82;p=github%2FChocobozzz%2FPeerTube.git diff --git a/scripts/dev/client.sh b/scripts/dev/client.sh index cdcf29ef2..e9cade800 100755 --- a/scripts/dev/client.sh +++ b/scripts/dev/client.sh @@ -1,14 +1,14 @@ -#!/bin/sh +#!/bin/bash set -eu -clientCommand="cd client && npm run ng -- serve --proxy-config proxy.config.json --hmr --configuration hmr --host 0.0.0.0 --disable-host-check --port 3000" -serverCommand="npm run build:server && NODE_ENV=test npm start" +clientCommand="cd client && node node_modules/.bin/ng serve --proxy-config proxy.config.json --hmr --configuration hmr --host 0.0.0.0 --disable-host-check --port 3000" +serverCommand="npm run build:server && NODE_ENV=test node dist/server" -if [ ! -z ${1+x} ] && [ "$1" == "--skip-server" ]; then +if [ ! -z ${1+x} ] && [ "$1" = "--skip-server" ]; then NODE_ENV=test eval $clientCommand else - NODE_ENV=test npm run concurrently -- -k \ + NODE_ENV=test node node_modules/.bin/concurrently -k \ "$clientCommand" \ "$serverCommand" fi