fix: correctly set custom and fallback port settings (#223)

dhis2 · Dec 20, 2019 · c2ac04c · c2ac04c
1 parent 6059571
commit c2ac04c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cli/src/commands/start.js b/cli/src/commands/start.js
@@ -56,7 +56,7 @@ const handler = async ({
             })
 
             const newPort = await detectPort(port)
-            if (newPort !== port) {
+            if (String(newPort) !== String(port)) {
                 reporter.print('')
                 reporter.warn(
                     `Something is already running on port ${port}, using ${newPort} instead.`

diff --git a/cli/src/lib/shell/index.js b/cli/src/lib/shell/index.js
@@ -20,12 +20,12 @@ module.exports = ({ config, paths }) => ({
             pipe: false,
         })
     },
-    start: async () => {
+    start: async ({ port }) => {
         await exec({
             cmd: 'yarn',
             args: ['run', 'start'],
             cwd: paths.shell,
-            env: getEnv({ name: config.title }),
+            env: getEnv({ name: config.title, port }),
             pipe: false,
         })
     },