#IQRV #comment 安装脚本：添加对文件不存在的校验&rvc仅拷贝Resource文件夹

addin/packaging/UOS/install.sh

@@ -27,7 +27,7 @@ echo "[RVCTermianal] === Install Start === "
 installScriptName=installsub.sh
 installScirpts=$MY_PATH/rvc/Resources/${installScriptName}
 if [ ! -f "${installScirpts}" ]; then
-    echo -e "\033[41;37m [ERROR] 安装脚本不存在，请检查当前版本已更新到最新版本，并检查版本的合法性和完整性！！ \033[0m"
+    echo -e "\033[41;37m [ERROR] 子安装脚本文件不存在，请检查安装包的合法性和完整性！！！ \033[0m"
 	exit 2
 fi
 

addin/packaging/UOS/installsub.in

@@ -122,12 +122,10 @@ if [ $(id -u) != 0 ]; then
     exit 1
 fi
 
-#生产环境要求先安装浏览器再执行安装
-if [ $installType -eq 1 ]; then
-    if [ "`dpkg -l | grep org.deepin.browser | awk '{print $3}'`" == "" ]; then
-        echo -e "\033[41;37m [ERROR] 未安装指定的浏览器，请至下载站点下载并安装UOS浏览器后再执行此安装脚本！ \033[0m"
-        exit 1
-    fi 
+#避免遗漏，要求先安装浏览器再执行安装
+if [ "`dpkg -l | grep org.deepin.browser | awk '{print $3}'`" == "" ]; then
+    echo -e "\033[41;37m [ERROR] 未安装指定的浏览器，请至下载站点下载并安装UOS浏览器后再执行此安装脚本！ \033[0m"
+    exit 1
 fi
 
 echo "[INFO] 清理可视柜台相关进程……"
@@ -212,25 +210,43 @@ if [ -d "${MY_PATH}/Run/runinfo" ]; then
 fi
 
 echo 【0/1】拷贝RVC目录...
+if [ ! -d "${rvc_pkg_rvc}/Resources" ]; then
+    echo -e "\033[41;37m [ERROR] Resources文件夹不存在，请检查安装包的合法性和完整性！！\033[0m"
+	exit 1
+fi
+
 if [ ! -d $rvc_install_path_rvc_dir ]; then
     sudo mkdir -p ${rvc_install_path_rvc_dir}
 fi
-if [ ! -d $rvc_install_path_rvc_dir/adData ]; then
-    sudo mkdir -p ${rvc_install_path_rvc_dir}/adData
-fi
 if [ ! -d $rvc_install_path_rvc_dir/Resources ]; then
     sudo mkdir -p ${rvc_install_path_rvc_dir}/Resources
 fi
-sudo cp -rf "${rvc_pkg_rvc}/adData/Audio ${rvc_install_path_rvc_dir}/adData" > /dev/null 2>&1
 sudo cp -rf "${rvc_pkg_rvc}/Resources" ${rvc_install_path_rvc_dir}
 
 echo 【1/1】拷贝RVC目录OK！
 
-echo 【1/2】拷贝终端版本，文件数量较多，部分终端拷贝时间比较长，请稍加等候......
+if [ ! -d "$MY_PATH/Run" ]; then
+    echo -e "\033[41;37m [ERROR] Run版本文件夹不存在，请检查安装包的合法性和完整性！！\033[0m"
+	exit 1
+fi
+if [ ! -d "$MY_PATH/Run/version" ]; then
+    echo -e "\033[41;37m [ERROR] version文件夹不存在，请检查安装包的合法性和完整性！！\033[0m"
+	exit 1
+fi
 if [ ! -d $rvc_install_path_Run_dir ]; then
     sudo mkdir -p ${rvc_install_path_Run_dir}
 fi
-sudo cp -rf "$MY_PATH/Run" ${rvc_install_path_root}
+if [ ! -d $rvc_install_path_hardware_dir ]; then
+    sudo mkdir -p ${rvc_install_path_hardware_dir}
+fi
+if [ ! -d $rvc_install_path_versions_dir ]; then
+    sudo mkdir -p ${rvc_install_path_versions_dir}
+fi
+echo 【1/2】拷贝终端版本，文件数量较多，部分终端拷贝时间比较长，请稍加等候......
+if [ -d "${MY_PATH}/Run/hardwarecfg" ]; then
+	sudo cp -rf "$MY_PATH/Run/hardwarecfg" ${rvc_install_path_Run_dir}
+fi
+sudo cp -rf "$MY_PATH/Run/version" ${rvc_install_path_Run_dir}
 echo 【2/2】拷贝终端版本OK！
 
 echo [INFO] 赋予应用相关文件执行权限
@@ -238,7 +254,7 @@ echo [DEBUG] rvc_install_path_rvc_dir=${rvc_install_path_rvc_dir}
 echo [DEBUG] ${rvc_install_path_root}/${rel_version_dir}
 sudo chmod 777 ${rvc_install_path_root}
 sudo chmod a+rw -R ${rvc_install_path_rvc_dir}
-sudo chmod a+rw -R ${rvc_install_path_hardware_dir}
+sudo chmod a+rw -R ${rvc_install_path_hardware_dir} > /dev/null 2>&1
 
 sudo chmod 777 -R ${rvc_install_path_root}/${rel_version_dir}
 sudo chmod 777 ${rvc_install_path_versions_dir}/spexplorer.sh > /dev/null 2>&1
@@ -258,7 +274,7 @@ if [ -f "${papers_dir}/WallPaper1920.png" ]; then
 	rm ${papers_dir}/WallPaper1280.png > /dev/null 2>&1
 else
 	if [ ! -f "${rvc_pkg_rvc}/Resources/WallPaper1920.png" ]; then
-		echo -e "\033[41;37m [ERROR] 壁纸资源文件不存在，请检查版本的合法性和完整性！！ \033[0m"
+		echo -e "\033[41;37m [ERROR] 壁纸资源文件不存在，请检查安装包的合法性和完整性！！ \033[0m"
 		exit 1
 	fi
 	if [ ! -d $papers_bak_dir ]; then
@@ -305,6 +321,14 @@ else
 fi
 echo [INFO] 设置应用自启动和桌面图标
 echo "[INFO] Copy application shortkeys to menu tools..."
+if [ ! -f "${rvc_pkg_rvc}/Resources/spexplorerauto.desktop" ]; then
+	echo -e "\033[41;37m [ERROR] 自启动快捷键资源文件不存在，请检查安装包的合法性和完整性！！ \033[0m"
+	exit 1
+fi
+if [ ! -f "/opt/Run/version/spexplorer.sh" ]; then
+	echo -e "\033[41;37m [ERROR] 应用启动脚本文件不存在，请检查安装包的合法性和完整性！！ \033[0m"
+	exit 1
+fi
 cp "${rvc_pkg_rvc}/Resources/spexplorerauto.desktop" /usr/share/applications
 echo "[INFO] Active application icon autorun after boot..."
 cp "${rvc_pkg_rvc}/Resources/spexplorerauto.desktop" /etc/xdg/autostart/
@@ -326,48 +350,16 @@ launcherURLDEV="http://99.12.23.78/uos/dde-launcher_5.3.0.45_arm64.zip"
 browserDownURL=${browserDownURLDEV}
 #测试环境才生效，生产环境无法确认下载链接地址
 if [ $installType -eq 0 ]; then
-	echo -e "\033[43;37m [WARN] 开发测试环境检测和安装UOS浏览器和输入法补丁 \033[0m"
 	if [ "`dpkg -l | grep org.deepin.browser | awk '{print $3}'`" == "" ]; then
-		echo "[WARN] 未安装最新的UOS浏览器，将自动下载安装UOS浏览器"
-		echo 下载最新的UOS浏览器...
-		rm -rf "${MY_PATH}/Tmp" > /dev/null 2>&1
-		mkdir -p "${MY_PATH}/Tmp" > /dev/null 2>&1
-		mkdir -p "${MY_PATH}/Tmp/Extra" > /dev/null 2>&1
-		wget -nv ${browserDownURL} -O "${MY_PATH}/Tmp/UOSBrowser.zip"
-		if [ $? -ne 0 ]; then
-			echo "[WARN]下载最新的UOS浏览器失败"
-		else
-			echo "[DEBUG] 下载最新的UOS浏览器 完成！"
-			unzip -q "${MY_PATH}/Tmp/UOSBrowser.zip" -d "${MY_PATH}/Tmp/Extra"
-			chmod 777 -R "${MY_PATH}/Tmp/Extra"
-			sudo dpkg -i ./Tmp/Extra/**/*.deb
-		fi
-		rm -rf "${MY_PATH}/Tmp" > /dev/null 2>&1
-	else
-		echo "[INFO] 已安装最新的UOS浏览器"	
+		echo -e "\033[43;37m [WARN] 未安装最新的UOS浏览器，请自行下载安装UOS浏览器 \033[0m"
 	fi
-	
 	if [ "`dpkg -l | grep libdde-file-manager`" != "" ]; then
 		currentInstallVersion=$(dpkg -l | grep libdde-file-manager | awk '{print $3}')
 		echo "[INFO] Current libdde-file-manager version: $currentInstallVersion"
 		if [ "$currentInstallVersion" = "5.2.11.2-1" ]; then
 			echo "[INFO] 已安装最新输入法补丁"
 		else
-			echo "[WARN] 未安装最新输入法补丁，将自动下载安装"
-			echo "[DEBUG] 下载最新输入法补丁..."
-		rm -rf "${MY_PATH}/Tmp" > /dev/null 2>&1
-		mkdir -p "${MY_PATH}/Tmp" > /dev/null 2>&1
-		mkdir -p "${MY_PATH}/Tmp/Extra" > /dev/null 2>&1
-		wget -nv ${fileManagerURLDEV} -O "${MY_PATH}/Tmp/SogouFileManager.zip"
-		if [ $? -ne 0 ]; then
-			echo "[WARN]下载最新输入法补丁失败"
-		else
-			echo "[DEBUG] 下载最新输入法补丁 完成！"
-			unzip -q "${MY_PATH}/Tmp/SogouFileManager.zip" -d "${MY_PATH}/Tmp/Extra"
-			chmod 777 -R "${MY_PATH}/Tmp/Extra"
-			sudo dpkg -i ./Tmp/Extra/**/*.deb
-		fi
-		rm -rf "${MY_PATH}/Tmp" > /dev/null 2>&1
+			echo -e "\033[43;37m [WARN] 未安装最新输入法补丁，请自行下载安装 \033[0m"
 		fi
 	fi
 	if [ "`dpkg -l | grep dde-launcher`" != "" ]; then
@@ -376,21 +368,7 @@ if [ $installType -eq 0 ]; then
 		if [ "$currentInstallVersion" = "5.3.0.45+203445.2-1" ]; then
 			echo "[INFO] 已安装最新输入法补丁（文件启动器）"
 		else
-			echo "[WARN] 未安装最新输入法补丁（文件启动器），将自动下载安装"
-			echo "[DEBUG] 下载最新输入法补丁（文件启动器）..."
-		rm -rf "${MY_PATH}/Tmp" > /dev/null 2>&1
-		mkdir -p "${MY_PATH}/Tmp" > /dev/null 2>&1
-		mkdir -p "${MY_PATH}/Tmp/Extra" > /dev/null 2>&1
-		wget -nv ${launcherURLDEV} -O "${MY_PATH}/Tmp/SogouLauncherMng.zip"
-		if [ $? -ne 0 ]; then
-			echo "[WARN]下载最新输入法补丁（文件启动器）失败"
-		else
-			echo "[DEBUG] 下载最新输入法补丁（文件启动器） 完成！"
-			unzip -q "${MY_PATH}/Tmp/SogouLauncherMng.zip" -d "${MY_PATH}/Tmp/Extra"
-			chmod 777 -R "${MY_PATH}/Tmp/Extra"
-			sudo dpkg -i ./Tmp/Extra/**/*.deb
-		fi
-		rm -rf "${MY_PATH}/Tmp" > /dev/null 2>&1
+			echo -e "\033[43;37m [WARN] 未安装最新输入法补丁（文件启动器），请自行下载安装 \033[0m"
 		fi
 	fi
 fi

addin/packaging/WIN/installbat.in

@@ -58,6 +58,10 @@ if "%sysProductKey%" == "" (
 @set AutoStartDir2=C:\ProgramData\Microsoft\Windows\Start Menu\Programs\StartUp
 @set VS2019MarkFile=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe
 
+@set RVCTerminalDirName=
+@set RVCTerminalDirFullPath=
+@set RVCCurInstallVersion=
+
 tasklist /nh | find /i "spshell.exe"
 @if errorlevel 1 (
 	@echo [INFO] 可视柜台进程不存在，跳过进程清理
@@ -105,28 +109,29 @@ tasklist /nh | find /i "spshell.exe"
 @echo [DEBUG] rvc_install_path_hardware_dir=%rvc_install_path_hardware_dir%
 @echo [DEBUG] rvc_install_path_versions_dir=%rvc_install_path_versions_dir%
 
-@set RVCTerminalDirName=
-@set RVCTerminalDirFullPath=
-@set RVCCurInstallVersion=
-@for /d %%a in ("%rvc_src_path_Run_dir%\version\*") do (
-	@set RVCTerminalDirFullPath=%%a
-	@set RVCTerminalDirName=%%~nxa
-	@goto GetRVCTerminalDirNameDone
-)
-:GetRVCTerminalDirNameDone
-@set RVCCurInstallVersion=%RVCTerminalDirName%
-@echo [DEBUG] RVCCurInstallVersion=%RVCCurInstallVersion%
 
+@echo 【0/1】拷贝RVC目录...
+
+@if not exist "%rvc_src_path_rvc_res_dir%" (
+	@call :ColorText 4F "[ERROR] Resources文件夹不存在，请检查安装包的合法性和完整性！！"
+	@goto InstallError
+)
 @if not exist "%rvc_install_path_rvc_dir%" md "%rvc_install_path_rvc_dir%"
 @if not exist "%rvc_install_path_rvc_res_dir%" md "%rvc_install_path_rvc_res_dir%"
+@xcopy "%rvc_src_path_rvc_res_dir%" %rvc_install_path_rvc_res_dir%  /E/Y/Q
+@echo 【1/1】拷贝RVC目录OK！
+
+@if not exist "%rvc_src_path_Run_dir%" (
+	@call :ColorText 4F "[ERROR] Run版本文件夹不存在，请检查安装包的合法性和完整性！！"
+	@goto InstallError
+)
+@if not exist "%rvc_src_path_Run_dir%\version" (
+	@call :ColorText 4F "[ERROR] version文件夹不存在，请检查安装包的合法性和完整性！！"
+	@goto InstallError
+)
 @if not exist "%rvc_install_path_Run_dir%" md "%rvc_install_path_Run_dir%"
 @if not exist "%rvc_install_path_hardware_dir%" md "%rvc_install_path_hardware_dir%"
 @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
-@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
@@ -182,6 +187,10 @@ 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" (
+		@if not exist "%WallpaperPath%" (
+			@call :ColorText 4F "[ERROR] 壁纸资源文件不存在，请检查安装包的合法性和完整性！！"
+			@goto InstallError
+		)
 		@copy "%WallpaperPath%" C:\Windows\Web\Wallpaper
 		@set WallpaperPath=C:\Windows\Web\Wallpaper\WallPaper1920.png
 		@set backupWallPaperPath=C:\\Windows\\Web\\Wallpaper\\WallPaper1920.png
@@ -216,7 +225,9 @@ reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v WallpaperStyle /t REG_DWORD
 
 @echo [DEBUG] 读取注册表信息
 @set regFile=%TEMP%\rvc_spshellautostart.reg
-@set regTmpFile=%cd%\rvckey.txt
+@set regTmpFile=%TEMP%\rvckey.txt
+@echo [DEBUG] %regFile%
+@echo [DEBUG] %regTmpFile%
 @set explorerKey=
 @set needSetAutoStartFlag=1
 @set explorerNormal=0
@@ -225,7 +236,7 @@ regedit /e %regFile% "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVe
 @for /f "usebackq delims== tokens=2" %%a in ("%regTmpFile%") do (
 	@set explorerKey=%%~a
 )
-@del %regFile%
+@del "%regFile%"
 @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%%
@@ -253,20 +264,20 @@ regedit /e %regFile% "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVe
 	regedit /s %regFile%
 	@del %regFile%
 )
-@echo [DEBUG] 移除旧有的可视柜台自启动文件
+@echo [DEBUG] 移除旧有的可视柜台自启动文件（如有）
 @echo [DEBUG] AutoStartDir=%AutoStartDir%
 @echo [DEBUG] AutoStartDir2=%AutoStartDir2%
 @if exist "%AutoStartDir%\%lnkPath%" (
-	@echo [DEBUG] 移除自启动文件1
+	@echo [DEBUG] 移除自启动文件 %AutoStartDir%\%lnkPath%
 	@del "%AutoStartDir%\%lnkPath%"
 )
 @if exist "%AutoStartDir2%\%lnkPath%" (
-	@echo [DEBUG] 移除自启动文件2
+	@echo [DEBUG] 移除自启动文件 %AutoStartDir2%\%lnkPath%
 	@del "%AutoStartDir2%\%lnkPath%"
 )
 @rem 移除旧有的可视柜台自启动快捷键（通过安装程序自动生成的）
 @for %%i in ("%AutoStartDir2%\招商银行可视柜台*.lnk") do (
-	@echo [DEBUG] %%i
+	@echo [DEBUG] 移除自启动文件 %%i
 	@del "%%i"
 )
 
@@ -297,6 +308,15 @@ mshta VBScript:Execute("Set a=CreateObject(""WScript.Shell""):Set b=a.CreateShor
 	@goto Done
 )
 
+@for /d %%a in ("%rvc_src_path_Run_dir%\version\*") do (
+	@set RVCTerminalDirFullPath=%%a
+	@set RVCTerminalDirName=%%~nxa
+	@goto GetRVCTerminalDirNameDone
+)
+:GetRVCTerminalDirNameDone
+@set RVCCurInstallVersion=%RVCTerminalDirName%
+@echo [DEBUG] RVCCurInstallVersion=%RVCCurInstallVersion%
+
 @call :ColorText 2F "[INFO] ===所有安装步骤执行成功，正常退出，请双击桌面图标启动可视柜台应用进入安装配置，可视柜台应用版本号：%RVCCurInstallVersion%==="
 @set /a timoutsecs=5
 @echo [INFO] %timoutsecs%s 后自动退出该执行脚本并最小化到桌面

addin/packaging/WIN/original.bat

@@ -65,6 +65,10 @@ if "%sysProductKey%" == "" (
 @set AutoStartDir2=C:\ProgramData\Microsoft\Windows\Start Menu\Programs\StartUp
 @set VS2019MarkFile=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe
 
+@set RVCTerminalDirName=
+@set RVCTerminalDirFullPath=
+@set RVCCurInstallVersion=
+
 tasklist /nh | find /i "spshell.exe"
 @if errorlevel 1 (
 	@echo [INFO] 可视柜台进程不存在，跳过进程清理
@@ -112,28 +116,29 @@ tasklist /nh | find /i "spshell.exe"
 @echo [DEBUG] rvc_install_path_hardware_dir=%rvc_install_path_hardware_dir%
 @echo [DEBUG] rvc_install_path_versions_dir=%rvc_install_path_versions_dir%
 
-@set RVCTerminalDirName=
-@set RVCTerminalDirFullPath=
-@set RVCCurInstallVersion=
-@for /d %%a in ("%rvc_src_path_Run_dir%\version\*") do (
-	@set RVCTerminalDirFullPath=%%a
-	@set RVCTerminalDirName=%%~nxa
-	@goto GetRVCTerminalDirNameDone
-)
-:GetRVCTerminalDirNameDone
-@set RVCCurInstallVersion=%RVCTerminalDirName%
-@echo [DEBUG] RVCCurInstallVersion=%RVCCurInstallVersion%
 
+@echo 【0/1】拷贝RVC目录...
+
+@if not exist "%rvc_src_path_rvc_res_dir%" (
+	@call :ColorText 4F "[ERROR] Resources文件夹不存在，请检查安装包的合法性和完整性！！"
+	@goto InstallError
+)
 @if not exist "%rvc_install_path_rvc_dir%" md "%rvc_install_path_rvc_dir%"
 @if not exist "%rvc_install_path_rvc_res_dir%" md "%rvc_install_path_rvc_res_dir%"
+@xcopy "%rvc_src_path_rvc_res_dir%" %rvc_install_path_rvc_res_dir%  /E/Y/Q
+@echo 【1/1】拷贝RVC目录OK！
+
+@if not exist "%rvc_src_path_Run_dir%" (
+	@call :ColorText 4F "[ERROR] Run版本文件夹不存在，请检查安装包的合法性和完整性！！"
+	@goto InstallError
+)
+@if not exist "%rvc_src_path_Run_dir%\version" (
+	@call :ColorText 4F "[ERROR] version文件夹不存在，请检查安装包的合法性和完整性！！"
+	@goto InstallError
+)
 @if not exist "%rvc_install_path_Run_dir%" md "%rvc_install_path_Run_dir%"
 @if not exist "%rvc_install_path_hardware_dir%" md "%rvc_install_path_hardware_dir%"
 @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
-@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
@@ -190,7 +195,7 @@ reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Hi
 @if not exist C:\Windows\Web\Wallpaper\WallPaper1920.png (
 	@if exist "C:\Windows\Web\Wallpaper" (
 		@if not exist "%WallpaperPath%" (
-			@call :ColorText 4F "[ERROR] 壁纸资源文件不存在，请检查版本的合法性和完整性！！"
+			@call :ColorText 4F "[ERROR] 壁纸资源文件不存在，请检查安装包的合法性和完整性！！"
 			@goto InstallError
 		)
 		@copy "%WallpaperPath%" C:\Windows\Web\Wallpaper
@@ -227,7 +232,9 @@ reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v WallpaperStyle /t REG_DWORD
 
 @echo [DEBUG] 读取注册表信息
 @set regFile=%TEMP%\rvc_spshellautostart.reg
-@set regTmpFile=%cd%\rvckey.txt
+@set regTmpFile=%TEMP%\rvckey.txt
+@echo [DEBUG] %regFile%
+@echo [DEBUG] %regTmpFile%
 @set explorerKey=
 @set needSetAutoStartFlag=1
 @set explorerNormal=0
@@ -236,7 +243,7 @@ regedit /e %regFile% "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVe
 @for /f "usebackq delims== tokens=2" %%a in ("%regTmpFile%") do (
 	@set explorerKey=%%~a
 )
-@del %regFile%
+@del "%regFile%"
 @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%%
@@ -264,20 +271,20 @@ regedit /e %regFile% "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVe
 	regedit /s %regFile%
 	@del %regFile%
 )
-@echo [DEBUG] 移除旧有的可视柜台自启动文件
+@echo [DEBUG] 移除旧有的可视柜台自启动文件（如有）
 @echo [DEBUG] AutoStartDir=%AutoStartDir%
 @echo [DEBUG] AutoStartDir2=%AutoStartDir2%
 @if exist "%AutoStartDir%\%lnkPath%" (
-	@echo [DEBUG] 移除自启动文件1
+	@echo [DEBUG] 移除自启动文件 %AutoStartDir%\%lnkPath%
 	@del "%AutoStartDir%\%lnkPath%"
 )
 @if exist "%AutoStartDir2%\%lnkPath%" (
-	@echo [DEBUG] 移除自启动文件2
+	@echo [DEBUG] 移除自启动文件 %AutoStartDir2%\%lnkPath%
 	@del "%AutoStartDir2%\%lnkPath%"
 )
 @rem 移除旧有的可视柜台自启动快捷键（通过安装程序自动生成的）
 @for %%i in ("%AutoStartDir2%\招商银行可视柜台*.lnk") do (
-	@echo [DEBUG] %%i
+	@echo [DEBUG] 移除自启动文件 %%i
 	@del "%%i"
 )
 
@@ -308,6 +315,15 @@ mshta VBScript:Execute("Set a=CreateObject(""WScript.Shell""):Set b=a.CreateShor
 	@goto Done
 )
 
+@for /d %%a in ("%rvc_src_path_Run_dir%\version\*") do (
+	@set RVCTerminalDirFullPath=%%a
+	@set RVCTerminalDirName=%%~nxa
+	@goto GetRVCTerminalDirNameDone
+)
+:GetRVCTerminalDirNameDone
+@set RVCCurInstallVersion=%RVCTerminalDirName%
+@echo [DEBUG] RVCCurInstallVersion=%RVCCurInstallVersion%
+
 @call :ColorText 2F "[INFO] ===所有安装步骤执行成功，正常退出，请双击桌面图标启动可视柜台应用进入安装配置，可视柜台应用版本号：%RVCCurInstallVersion%==="
 @set /a timoutsecs=5
 @echo [INFO] %timoutsecs%s 后自动退出该执行脚本并最小化到桌面