#IQRV #comment 安装脚本优化

CMakeLists.txt

@@ -662,13 +662,11 @@ else(MSVC)
 	endif(NOT DEVOPS_ON)
 
 	install(CODE "execute_process(COMMAND 'chmod 0777 ${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/*')")
-	install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/logo.png"
-		"${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/spexplorerauto.desktop"
+	install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/spexplorerauto.desktop"
 		DESTINATION "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT resources)
 endif(MSVC)
 
 install(FILES "${CMAKE_SOURCE_DIR}/addin/assets/VTM.ico"
-	"${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/WallPaper1280.png"
 	"${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/WallPaper1920.png"
 	DESTINATION "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT resources)
 

addin/packaging/UOS/original.sh

@@ -134,12 +134,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] 清理可视柜台相关进程……"
@@ -224,25 +222,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] 赋予应用相关文件执行权限
@@ -250,7 +266,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
@@ -270,7 +286,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
@@ -317,6 +333,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/
@@ -338,48 +362,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
@@ -388,21 +380,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/original.bat

@@ -233,8 +233,8 @@ reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v WallpaperStyle /t REG_DWORD
 @echo [DEBUG] 读取注册表信息
 @set regFile=%TEMP%\rvc_spshellautostart.reg
 @set regTmpFile=%TEMP%\rvckey.txt
-@echo [DEBUG] %regFile%
-@echo [DEBUG] %regTmpFile%
+@rem @echo [DEBUG] %regFile%
+@rem @echo [DEBUG] %regTmpFile%
 @set explorerKey=
 @set needSetAutoStartFlag=1
 @set explorerNormal=0
@@ -250,13 +250,13 @@ regedit /e %regFile% "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVe
 @echo [DEBUG] explorer key:%explorerKey%
 
 @if "%explorerKey%" == "explorer.exe" (
-	@echo [DEBUG] 检测到未设置为开机自启动模式
+	@echo [INFO] 检测到未设置为开机自启动模式
 	@set explorerNormal=1
 ) else if "%explorerKey%" == "d:\\run\\version\\vtm.exe" (
 	@call :ColorText 2F "检测到已设置为VTM.exe开机自启动模式"
 	@set needSetAutoStartFlag=0
 ) else if "%explorerKey%" == "wscript d:\\run\\version\\spexplorerfast.vbs" (
-	@echo [DEBUG] 检测到已设置为VBS脚本开机自启动模式
+	@echo [INFO] 检测到已设置为VBS脚本开机自启动模式
 )
 
 @if %explorerNormal% neq 1 (
@@ -272,8 +272,8 @@ regedit /e %regFile% "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVe
 	@del %regFile%
 )
 @echo [DEBUG] 移除旧有的可视柜台自启动文件（如有）
-@echo [DEBUG] AutoStartDir=%AutoStartDir%
-@echo [DEBUG] AutoStartDir2=%AutoStartDir2%
+@rem @echo [DEBUG] AutoStartDir=%AutoStartDir%
+@rem @echo [DEBUG] AutoStartDir2=%AutoStartDir2%
 @if exist "%AutoStartDir%\%lnkPath%" (
 	@echo [DEBUG] 移除自启动文件 %AutoStartDir%\%lnkPath%
 	@del "%AutoStartDir%\%lnkPath%"