#IQRV #comment 统一WIN&UOS的启动图标和名称

CMakeLists.txt

@@ -637,33 +637,20 @@ if(MSVC)
 	if(CPACK_GENERATOR MATCHES "NSIS")
 		set(CPACK_PACKAGE_INSTALL_DIRECTORY "C:\\\\Run")
 	endif()
-	install(FILES "${CMAKE_SOURCE_DIR}/addin/assets/VTM.ico"
-		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 "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT resources)
 else(MSVC)
-	if(PACK_AS_DEB_PKG)
-		# This is not the same purpose as CMAKE_INSTALL_PREFIX 
-		# which is used when installing from the build tree without building a package
-		set(CPACK_PACKAGING_INSTALL_PREFIX "/opt")
-		# set(CPACK_PACKAGE_INSTALL_DIRECTORY "/opt")
-		include(debian)
-		message(STATUS "set deb package file type")
-	else()
-		if(NOT CPACK_GENERATOR)
-			set(CPACK_GENERATOR "ZIP")
-			message(STATUS "set zip package file type for matching head bank publish")
-		endif()
-		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"
-			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 "${PACK_INSTALL_RVC_DIR}/Resources" COMPONENT resources)
-	endif(PACK_AS_DEB_PKG)
+	if(NOT CPACK_GENERATOR)
+		set(CPACK_GENERATOR "ZIP")
+		message(STATUS "set zip package file type for matching head bank publish")
+	endif()
+	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"
+		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)
 
 if(MSVC)
 	if(MSVC_RUNTIME STREQUAL "dynamic")

addin/packaging/DEBIAN/spexplorerauto.desktop

@@ -1,12 +1,12 @@
 [Desktop Entry]
 Name=RVC Terminal
-Name[zh_CN]=招行可视柜台终端应用
+Name[zh_CN]=可视柜台
 GenericName=RVC Terminal Application
 GenericName[zh_CN]=招行可视柜台终端应用程序
 Comment=RVC Terminal Application
 Comment[zh_CN]=招行可视柜台终端应用
 Exec=/opt/Run/version/sudo_spexplorer.sh
-Icon=/opt/rvc/Resources/logo.png
+Icon=/opt/rvc/Resources/VTM.ico
 Type=Application
 Keywords=CMB;RVC;Terminal;
 Terminal=false

addin/packaging/UOS/installsh.in

@@ -282,8 +282,7 @@ echo copy rvc Audio files completely!
 #sudo cp -rvf $MY_PATH/rvc/adData/Video ${rvc_install_path_rvc_dir}/adData
 #echo copy rvc Video files completely!
 echo "[INFO]: Copy application icon to Resource dir..."
-cp ${rvc_pkg_rvc}/Resources/logo.png ${rvc_install_path_rvc_dir}/Resources
-
+cp ${rvc_pkg_rvc}/Resources/VTM.ico ${rvc_install_path_rvc_dir}/Resources
 
 echo "[INFO]: change the run scripts priviledge..."
 echo ${rvc_install_path_rvc_dir}

addin/packaging/UOS/original.sh

@@ -294,8 +294,7 @@ echo copy rvc Audio files completely!
 #sudo cp -rvf $MY_PATH/rvc/adData/Video ${rvc_install_path_rvc_dir}/adData
 #echo copy rvc Video files completely!
 echo "[INFO]: Copy application icon to Resource dir..."
-cp ${rvc_pkg_rvc}/Resources/logo.png ${rvc_install_path_rvc_dir}/Resources
-
+cp ${rvc_pkg_rvc}/Resources/VTM.ico ${rvc_install_path_rvc_dir}/Resources
 
 echo "[INFO]: change the run scripts priviledge..."
 echo ${rvc_install_path_rvc_dir}