#IQRV #comment 对缺少壁纸文件的兼容处理

addin/packaging/UOS/install.sh

@@ -56,7 +56,8 @@ WallpaperPath=${rvc_install_path_rvc_dir}/Resources/WallPaper1920.png
 SyspaperPath=/usr/share/wallpapers/deepin/WallPaper1920.png
 if [ ! -f ${SyspaperPath} ]; then
 	if [ ! -f ${WallpaperPath} ]; then
-		exit 0
+		echo -e "\033[41;37m [ERROR] 壁纸资源文件不存在，设置系统桌面壁纸失败！！ \033[0m"
+		exit 1
 	fi
 	SyspaperPath=${WallpaperPath}
 fi

addin/packaging/UOS/installsub.in

@@ -257,6 +257,10 @@ if [ -f "${papers_dir}/WallPaper1920.png" ]; then
 	WallpaperPath=${papers_dir}/WallPaper1920.png
 	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"
+		exit 1
+	fi
 	if [ ! -d $papers_bak_dir ]; then
 		mkdir -p ${papers_bak_dir}
 		cp $papers_dir/* $papers_bak_dir

addin/packaging/UOS/original.sh

@@ -143,6 +143,23 @@ if [ $installType -eq 1 ]; then
 fi
 
 echo "[INFO] 清理可视柜台相关进程……"
+chromium_pid=$(ps -aux | grep mod_chromium | grep sphost | awk 'NR==1{print $2}')
+echo "[DEBUG] chromium_pid=$chromium_pid"
+timoutsecs4chromium=5
+if [  "${chromium_pid}" != "" ]; then
+	echo "[INFO] has mod_chromium pid to SIGTERM it and wait"
+	sudo kill -s 15 ${chromium_pid}
+	for i in $(seq ${timoutsecs4chromium} -1 1)
+	do
+		echo "[DEBUG] wait chrmoium process exit"
+		sleep 1
+		chromium_pid=$(ps -aux | grep mod_chromium | grep sphost | awk 'NR==1{print $2}')
+		if [  "${chromium_pid}" == "" ]; then
+			echo "[INFO] chrmoium process has been exit"
+			break
+		fi
+	done
+fi
 killall -9 spshell > /dev/null 2>&1
 killall -9 sphost > /dev/null 2>&1
 killall -9 guardian > /dev/null 2>&1
@@ -252,6 +269,10 @@ if [ -f "${papers_dir}/WallPaper1920.png" ]; then
 	WallpaperPath=${papers_dir}/WallPaper1920.png
 	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"
+		exit 1
+	fi
 	if [ ! -d $papers_bak_dir ]; then
 		mkdir -p ${papers_bak_dir}
 		cp $papers_dir/* $papers_bak_dir

addin/packaging/WIN/original.bat

@@ -189,6 +189,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