Skip to content

Commit 8385187

Browse files
committed
additional improvements to quoting
1 parent 90da7a8 commit 8385187

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

package/scripts/windows/quarto.cmd

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
SETLOCAL ENABLEDELAYEDEXPANSION
44

5-
SET SCRIPT_DIR=%~dp0
5+
SET "SCRIPT_DIR=%~dp0"
66
SET DEV_PATH=..\..\..\src\
77

88
SET SRC_PATH=%SCRIPT_DIR%%DEV_PATH%
9-
SET QUARTO_TS_PATH="%SRC_PATH%quarto.ts"
9+
SET "QUARTO_TS_PATH=%SRC_PATH%quarto.ts"
1010

1111
IF EXIST "%QUARTO_TS_PATH%" (
12-
12+
1313
IF "%1"=="--version" (
1414
ECHO 99.9.9
1515
GOTO end
@@ -28,22 +28,23 @@ IF EXIST "%QUARTO_TS_PATH%" (
2828
IF "%QUARTO_TARGET%"=="" (
2929
SET QUARTO_TARGET="%QUARTO_TS_PATH%"
3030
)
31-
31+
3232
SET "QUARTO_BIN_PATH=!SCRIPT_DIR!"
3333
SET "QUARTO_SHARE_PATH=!SRC_PATH!resources\"
3434
SET QUARTO_DEBUG=true
35-
SET "QUARTO_DEV_DIR=!SCRIPT_DIR!..\..\.."
35+
SET QUARTO_DEV_DIR=!SCRIPT_DIR!..\..\..
3636
SET DENO_VERSION_FILE="!SCRIPT_DIR!..\config\deno-version"
37-
38-
FOR /F "tokens=*" %%A IN (!QUARTO_DEV_DIR!\configuration) DO CALL :convertExportToSet %%A
37+
SET "QUARTO_CONFIG_FILE=!QUARTO_DEV_DIR!\configuration"
38+
FOR /F "usebackq tokens=*" %%A IN ("!QUARTO_CONFIG_FILE!") DO CALL :convertExportToSet %%A
3939

4040
if exist "!DENO_VERSION_FILE!" (
41+
4142
set /p DENO_INSTALLED_VERSION=<"!DENO_VERSION_FILE!"
42-
if NOT "!DENO!"=="!DENO_INSTALLED_VERSION!" (
43+
if NOT "!DENO!"=="!DENO_INSTALLED_VERSION!" (
4344
echo !DENO!>"!DENO_VERSION_FILE!"
4445

4546
cd !QUARTO_DEV_DIR!
46-
REM call configure-windows.cmd
47+
call configure-windows.cmd
4748
echo
4849
echo Quarto required reconfiguration to install Deno !DENO!. Please try command again.
4950
GOTO end
@@ -52,7 +53,6 @@ IF EXIST "%QUARTO_TS_PATH%" (
5253
echo !DENO!>"!DENO_VERSION_FILE!"
5354
)
5455

55-
5656
) ELSE (
5757

5858
IF "%1"=="--version" (

0 commit comments

Comments
 (0)