From 0e8cf75bde113f6c0040f61a679882372b53b8b7 Mon Sep 17 00:00:00 2001
From: Aditya Lohuni <99452671+snowleopard17@users.noreply.github.com>
Date: Wed, 3 Jan 2024 22:22:21 +0700
Subject: [PATCH] Improve Quotation and Path Handling in CLI Tools (#2238)

---
 packages/cli-tools/src/launchPackager.command    | 4 ++--
 packages/cli-tools/src/startServerInNewWindow.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/cli-tools/src/launchPackager.command b/packages/cli-tools/src/launchPackager.command
index 502704132..2e3587924 100755
--- a/packages/cli-tools/src/launchPackager.command
+++ b/packages/cli-tools/src/launchPackager.command
@@ -3,8 +3,8 @@
 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 
 source "$THIS_DIR/.packager.env"
-cd $PROJECT_ROOT
-$REACT_NATIVE_PATH/cli.js start --port $RCT_METRO_PORT
+cd "$PROJECT_ROOT"
+"$REACT_NATIVE_PATH/cli.js" start --port $RCT_METRO_PORT
 
 if [[ -z "$CI" ]]; then
   echo "Process terminated. Press <enter> to close the window"
diff --git a/packages/cli-tools/src/startServerInNewWindow.ts b/packages/cli-tools/src/startServerInNewWindow.ts
index def7bb8ea..ca84deca6 100644
--- a/packages/cli-tools/src/startServerInNewWindow.ts
+++ b/packages/cli-tools/src/startServerInNewWindow.ts
@@ -27,7 +27,7 @@ function startServerInNewWindow(
   const packagerEnvFilename = isWindows ? '.packager.bat' : '.packager.env';
   const packagerEnvFileExportContent = isWindows
     ? `set RCT_METRO_PORT=${port}\nset PROJECT_ROOT=${projectRoot}\nset REACT_NATIVE_PATH=${reactNativePath}`
-    : `export RCT_METRO_PORT=${port}\nexport PROJECT_ROOT=${projectRoot}\nexport REACT_NATIVE_PATH=${reactNativePath}`;
+    : `export RCT_METRO_PORT=${port}\nexport PROJECT_ROOT="${projectRoot}"\nexport REACT_NATIVE_PATH="${reactNativePath}"`;
   const nodeModulesPath = resolveNodeModuleDir(projectRoot, '.bin');
   const cliPluginMetroPath = path.join(
     path.dirname(