Z991239-5285 #comment 壁纸拷贝到Resources目录下

CMakeLists.txt

@@ -674,7 +674,7 @@ else(MSVC)
 			DESTINATION "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT resources)
 		install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/WallPaper1280.png"
 			"${CMAKE_SOURCE_DIR}/addin/packaging/DEBIAN/WallPaper1920.png"
-			DESTINATION "/usr/share/wallpapers/deepin/" COMPONENT resources)
+			DESTINATION "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT resources)
 	endif(PACK_AS_DEB_PKG)
 endif(MSVC)
 

addin/installv2.sh

@@ -115,8 +115,6 @@ argument1=
 if [ $# -eq 1 ];then
     echo has arguments: $*
 	argument1=$(echo $1 | awk '{ print tolower($0) }' )
-	#tolower_vendor=$(echo $1 | awk '{ print tolower($0) }' )
-    #upper_vendor=$(echo $1 | awk '{ print toupper($0) }' )
 else
     echo no any arguments.
 fi
@@ -158,6 +156,7 @@ if [ "$argument1" = "uninstall" ]; then
     if [ -d $papers_bak_dir ]; then
         rm -rf $papers_dir/*  > /dev/null 2>&1
         cp $papers_bak_dir/* $papers_dir
+		rm -rf $papers_bak_dir
     fi
 	
 	exit 0
@@ -192,7 +191,8 @@ else
 		cp $papers_dir/* $papers_bak_dir
 	fi
 	rm -rf $papers_dir/* > /dev/null 2>&1
-	echo "TODO: copy wallpaper files"
+	cp ${rvc_install_path_rvc_dir}/Resources/WallPaper1280.png ${papers_dir}
+	cp ${rvc_install_path_rvc_dir}/Resources/WallPaper1920.png ${papers_dir}
 fi
 
 echo "============== previous installation custom scripts done =============="
@@ -208,18 +208,17 @@ slen=${#MY_PATH}
 rel_version_dir=${version_dir:$slen+1}
 echo ${rel_version_dir}
 
+# 如果版本中有root.ini，移除测试的root.ini文件
+if [ -f ${MY_PATH}/Run/hardwarecfg/root.ini ]; then
+	sudo rm ${MY_PATH}/Run/hardwarecfg/root.ini
+fi
+if [ -d ${MY_PATH}/Run/runinfo ]; then
+	sudo rm -rf ${MY_PATH}/Run/runinfo
+fi
+
 if [ ! -f $rvc_install_path_hardware_dir/root.ini ]; then
     #delete /opt/Run
     sudo rm -rf ${rvc_install_path_Run_dir}
-else
-    echo root.ini 文件已存在，跳过清除 Run 文件夹
-	# 如果版本中有root.ini，移除测试的root.ini文件
-    if [ -f ${MY_PATH}/Run/hardwarecfg/root.ini ]; then
-        sudo rm ${MY_PATH}/Run/hardwarecfg/root.ini
-    fi
-    if [ -d ${MY_PATH}/Run/runinfo ]; then
-        sudo rm -rf ${MY_PATH}/Run/runinfo
-    fi
 fi
 
 #copy the Run pkg to run path