5 files changed, 12 insertions, 10 deletions

diff --git a/scripts/dev/cli.sh b/scripts/dev/cli.sh
index 4b6fe5508..dc6f0af0d 100755
--- a/scripts/dev/cli.sh
+++ b/scripts/dev/cli.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu
 
diff --git a/scripts/dev/client.sh b/scripts/dev/client.sh
index bcb8b88f6..e9cade800 100755
--- a/scripts/dev/client.sh
+++ b/scripts/dev/client.sh
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu
 
 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 node node_modules/.bin/concurrently -k \
diff --git a/scripts/dev/embed.sh b/scripts/dev/embed.sh
index 9b0ef27cf..b4835604e 100755
--- a/scripts/dev/embed.sh
+++ b/scripts/dev/embed.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu
 
diff --git a/scripts/dev/index.sh b/scripts/dev/index.sh
index d221d2fc8..56addb7fe 100755
--- a/scripts/dev/index.sh
+++ b/scripts/dev/index.sh
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu
 
 NODE_ENV=test npm run concurrently -- -k \
-  "npm run dev:client -- --skip-server" \
-  "npm run dev:server"
+  "sh scripts/dev/client.sh --skip-server" \
+  "sh scripts/dev/server.sh --skip-client"
diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh
index b09a966dd..680ca3d79 100755
--- a/scripts/dev/server.sh
+++ b/scripts/dev/server.sh
@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu
 
 if [ ! -f "./client/dist/en-US/index.html" ]; then
-  echo "client/dist/en-US/index.html does not exist, compile client files..."
-  npm run build:client -- --light
+  if [ -z ${1+x} ] || [ "$1" != "--skip-client" ]; then
+    echo "client/dist/en-US/index.html does not exist, compile client files..."
+    npm run build:client -- --light
+  fi
 fi
 
 # Copy locales