Browse Source

#IQRV #comment 修复安装脚本源路径带括号的兼容问题

80374374 1 year ago
parent
commit
e597d4fc8f
2 changed files with 18 additions and 18 deletions
  1. 9 9
      addin/packaging/WIN/installbat.in
  2. 9 9
      addin/packaging/WIN/original.bat

+ 9 - 9
addin/packaging/WIN/installbat.in

@@ -108,7 +108,7 @@ tasklist /nh | find /i "spshell.exe"
 @set RVCTerminalDirName=
 @set RVCTerminalDirFullPath=
 @set RVCCurInstallVersion=
-@for /d %%a in (%rvc_src_path_Run_dir%\version\*) do (
+@for /d %%a in ("%rvc_src_path_Run_dir%\version\*") do (
 	@set RVCTerminalDirFullPath=%%a
 	@set RVCTerminalDirName=%%~nxa
 	@goto GetRVCTerminalDirNameDone
@@ -124,12 +124,12 @@ tasklist /nh | find /i "spshell.exe"
 @if not exist "%rvc_install_path_versions_dir%" md "%rvc_install_path_versions_dir%"
 
 @echo 【0/1】拷贝RVC目录...
-@xcopy %rvc_src_path_rvc_dir% %rvc_install_path_rvc_dir%  /E/Y/Q
+@xcopy "%rvc_src_path_rvc_dir%" %rvc_install_path_rvc_dir%  /E/Y/Q
 @echo 【1/1】拷贝RVC目录OK!
 
 @echo 【1/2】拷贝终端版本,文件数量较多,部分终端拷贝时间比较长,请稍加等候......
-@if exist %rvc_src_path_Run_dir%\hardwarecfg ( xcopy %rvc_src_path_Run_dir%\hardwarecfg %rvc_install_path_hardware_dir%  /E/Y/Q )
-@xcopy %rvc_src_path_Run_dir%\version %rvc_install_path_versions_dir%  /E/Y/Q
+@if exist "%rvc_src_path_Run_dir%\hardwarecfg" ( xcopy "%rvc_src_path_Run_dir%\hardwarecfg" "%rvc_install_path_hardware_dir%"  /E/Y/Q )
+@xcopy "%rvc_src_path_Run_dir%\version" "%rvc_install_path_versions_dir%"  /E/Y/Q
 @echo 【2/2】拷贝终端版本OK!
 
 @echo 【2/3】设置系统桌面壁纸
@@ -182,7 +182,7 @@ reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Hi
 @set WallpaperPath=%rvc_install_path_rvc_res_dir%\WallPaper1920.png
 @if not exist C:\Windows\Web\Wallpaper\WallPaper1920.png (
 	@if exist "C:\Windows\Web\Wallpaper" (
-		@copy %WallpaperPath% C:\Windows\Web\Wallpaper
+		@copy "%WallpaperPath%" C:\Windows\Web\Wallpaper
 		@set WallpaperPath=C:\Windows\Web\Wallpaper\WallPaper1920.png
 		@set backupWallPaperPath=C:\\Windows\\Web\\Wallpaper\\WallPaper1920.png
 	)
@@ -194,7 +194,7 @@ reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Hi
 @echo [DEBUG] WallpaperPath=%WallpaperPath%
 @echo [INFO] 通过注册表设置桌面壁纸
 @set regWallpaperFile=%TEMP%\rvc_wallpaperset.reg
-reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v Wallpaper /t REG_SZ /d %WallpaperPath% /f 
+reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v Wallpaper /t REG_SZ /d "%WallpaperPath%" /f 
 reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v WallpaperStyle /t REG_DWORD /d 2 /f
 @if %errorlevel% neq 0 (
 	@echo [DEBUG] backupWallPaperPath=%backupWallPaperPath%
@@ -221,12 +221,12 @@ reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v WallpaperStyle /t REG_DWORD
 @set needSetAutoStartFlag=1
 @set explorerNormal=0
 regedit /e %regFile% "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon"
-@type %regFile% | find /I """Shell""=" > %regTmpFile%
-@for /f "usebackq delims== tokens=2" %%a in (%regTmpFile%) do (
+@type %regFile% | find /I """Shell""=" > "%regTmpFile%"
+@for /f "usebackq delims== tokens=2" %%a in ("%regTmpFile%") do (
 	@set explorerKey=%%~a
 )
 @del %regFile%
-@del %regTmpFile%
+@del "%regTmpFile%"
 @echo [DEBUG] original explorer key:%explorerKey%
 @for %%i in (a b c d e f g h i j k l m n o p q r s t u v w x y z) do call set explorerKey=%%explorerKey:%%i=%%i%%
 @echo [DEBUG] explorer key:%explorerKey%

+ 9 - 9
addin/packaging/WIN/original.bat

@@ -115,7 +115,7 @@ tasklist /nh | find /i "spshell.exe"
 @set RVCTerminalDirName=
 @set RVCTerminalDirFullPath=
 @set RVCCurInstallVersion=
-@for /d %%a in (%rvc_src_path_Run_dir%\version\*) do (
+@for /d %%a in ("%rvc_src_path_Run_dir%\version\*") do (
 	@set RVCTerminalDirFullPath=%%a
 	@set RVCTerminalDirName=%%~nxa
 	@goto GetRVCTerminalDirNameDone
@@ -131,12 +131,12 @@ tasklist /nh | find /i "spshell.exe"
 @if not exist "%rvc_install_path_versions_dir%" md "%rvc_install_path_versions_dir%"
 
 @echo 【0/1】拷贝RVC目录...
-@xcopy %rvc_src_path_rvc_dir% %rvc_install_path_rvc_dir%  /E/Y/Q
+@xcopy "%rvc_src_path_rvc_dir%" %rvc_install_path_rvc_dir%  /E/Y/Q
 @echo 【1/1】拷贝RVC目录OK!
 
 @echo 【1/2】拷贝终端版本,文件数量较多,部分终端拷贝时间比较长,请稍加等候......
-@if exist %rvc_src_path_Run_dir%\hardwarecfg ( xcopy %rvc_src_path_Run_dir%\hardwarecfg %rvc_install_path_hardware_dir%  /E/Y/Q )
-@xcopy %rvc_src_path_Run_dir%\version %rvc_install_path_versions_dir%  /E/Y/Q
+@if exist "%rvc_src_path_Run_dir%\hardwarecfg" ( xcopy "%rvc_src_path_Run_dir%\hardwarecfg" "%rvc_install_path_hardware_dir%"  /E/Y/Q )
+@xcopy "%rvc_src_path_Run_dir%\version" "%rvc_install_path_versions_dir%"  /E/Y/Q
 @echo 【2/2】拷贝终端版本OK!
 
 @echo 【2/3】设置系统桌面壁纸
@@ -189,7 +189,7 @@ reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Hi
 @set WallpaperPath=%rvc_install_path_rvc_res_dir%\WallPaper1920.png
 @if not exist C:\Windows\Web\Wallpaper\WallPaper1920.png (
 	@if exist "C:\Windows\Web\Wallpaper" (
-		@copy %WallpaperPath% C:\Windows\Web\Wallpaper
+		@copy "%WallpaperPath%" C:\Windows\Web\Wallpaper
 		@set WallpaperPath=C:\Windows\Web\Wallpaper\WallPaper1920.png
 		@set backupWallPaperPath=C:\\Windows\\Web\\Wallpaper\\WallPaper1920.png
 	)
@@ -201,7 +201,7 @@ reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Hi
 @echo [DEBUG] WallpaperPath=%WallpaperPath%
 @echo [INFO] 通过注册表设置桌面壁纸
 @set regWallpaperFile=%TEMP%\rvc_wallpaperset.reg
-reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v Wallpaper /t REG_SZ /d %WallpaperPath% /f 
+reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v Wallpaper /t REG_SZ /d "%WallpaperPath%" /f 
 reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v WallpaperStyle /t REG_DWORD /d 2 /f
 @if %errorlevel% neq 0 (
 	@echo [DEBUG] backupWallPaperPath=%backupWallPaperPath%
@@ -228,12 +228,12 @@ reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v WallpaperStyle /t REG_DWORD
 @set needSetAutoStartFlag=1
 @set explorerNormal=0
 regedit /e %regFile% "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon"
-@type %regFile% | find /I """Shell""=" > %regTmpFile%
-@for /f "usebackq delims== tokens=2" %%a in (%regTmpFile%) do (
+@type %regFile% | find /I """Shell""=" > "%regTmpFile%"
+@for /f "usebackq delims== tokens=2" %%a in ("%regTmpFile%") do (
 	@set explorerKey=%%~a
 )
 @del %regFile%
-@del %regTmpFile%
+@del "%regTmpFile%"
 @echo [DEBUG] original explorer key:%explorerKey%
 @for %%i in (a b c d e f g h i j k l m n o p q r s t u v w x y z) do call set explorerKey=%%explorerKey:%%i=%%i%%
 @echo [DEBUG] explorer key:%explorerKey%