Merge branch 'main' of github.com:quarto-dev/quarto-cli into main

Author: jjallaire

package/scripts/common/quarto

@@ -35,24 +35,24 @@ if [ -f "$DEV_PATH" ]; then
   QUARTO_DIST_CONFIG=$QUARTO_BIN_PATH/../config
   mkdir -p $QUARTO_DIST_CONFIG
   DENO_VERSION_FILE=$QUARTO_DIST_CONFIG/deno-version
-  DENO_SOURCE_VERSION=`(cd $QUARTO_SRC_DIR && source ./configuration && echo $DENO)`
+  DENO_SOURCE_VERSION="`(cd "$QUARTO_SRC_DIR" && source ./configuration && echo $DENO)`"
   if [ -f "$DENO_VERSION_FILE" ]; then
-    DENO_INSTALLED_VERSION=`cat $DENO_VERSION_FILE`
+    DENO_INSTALLED_VERSION=`cat "$DENO_VERSION_FILE"`
     if [ "$DENO_SOURCE_VERSION" != "$DENO_INSTALLED_VERSION" ]; then
       # configure will call back into this script so we need to update the
       # version so that the check will pass next time through
-      echo $DENO_SOURCE_VERSION > $DENO_VERSION_FILE
+      echo $DENO_SOURCE_VERSION > "$DENO_VERSION_FILE"
       if [ "$(uname)" = "Darwin" ]; then
-        (cd $QUARTO_SRC_DIR && ./configure-macos.sh)
+        (cd "$QUARTO_SRC_DIR" && ./configure-macos.sh)
       else
-        (cd $QUARTO_SRC_DIR && ./configure-linux.sh)
+        (cd "$QUARTO_SRC_DIR" && ./configure-linux.sh)
       fi
       echo ""
       printf "\\033[0;31mQuarto required reconfiguration to install Deno ${DENO_SOURCE_VERSION}. Please try command again.\\033[0m\n\n"
       exit 1
     fi
   else
-    echo $DENO_SOURCE_VERSION > $DENO_VERSION_FILE
+    echo $DENO_SOURCE_VERSION > "$DENO_VERSION_FILE"
   fi
 
   if [ "$1" == "--version" ] || [ "$1" == "-v" ]; then
@@ -103,4 +103,4 @@ fi
 # Be sure to include any already defined QUARTO_DENO_OPTIONS
 QUARTO_DENO_OPTIONS="--unstable --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}"
 
-${SCRIPT_PATH}/tools/deno ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} ${QUARTO_IMPORT_ARGMAP} ${QUARTO_TARGET} "$@"
+"${SCRIPT_PATH}/tools/deno" ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@"

tests/run-tests.sh

@@ -35,7 +35,7 @@ python3 -m pip install -r requirements.txt -q
 # Ensure that tinytex is installed
 quarto tools install tinytex
 
-${DENO_DIR}/tools/deno test ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} ${QUARTO_IMPORT_ARGMAP} $@
+"${DENO_DIR}/tools/deno" test ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" $@
 
 SUCCESS=$?