From 3aab3e7ded4b6e7ddeab6947803a5878b5d0abc0 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Mon, 19 Aug 2024 10:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BD=E4=BA=A7=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9Fuos=E6=8C=89=E9=94=AE=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh                                      | 29 +++++++++++++++++--
 uos/hgtool/DEBIAN/control                     |  6 ++--
 uos/hgtool/DEBIAN/postinst                    |  2 +-
 ...=> com.huagaochina.huagaoscantool.desktop} |  2 +-
 4 files changed, 31 insertions(+), 8 deletions(-)
 rename uos/hgtool/usr/share/applications/{scanner-driver-huagaoscantool.desktop => com.huagaochina.huagaoscantool.desktop} (76%)
 mode change 100755 => 100644

diff --git a/build.sh b/build.sh
index fbfe21b..4a02be0 100755
--- a/build.sh
+++ b/build.sh
@@ -84,7 +84,6 @@ then
 	echo $sanelibname
 elif [ "${oem:0-4:4}" == "tool" ];
 then
-	dpkgtype=kylin
 	sanelibname="${oem%${oem:0-4:4}*}"
 	echo $sanelibname
 else
@@ -99,6 +98,30 @@ function appbuild()
 	echo "-----------------------------start-----------------------------"
 	#GIT CODE
 
+	rm ../release/$syspath/$cpu/* 
+	
+	git -C ../release clean -df
+	git -C ../release checkout .
+	git -C ../release pull
+
+	git -C ../sdk clean -df
+	git -C ../sdk checkout .
+	git -C ../sdk pull
+
+	git -C ../code_device clean -df
+	git -C ../code_device checkout .
+	git -C ../code_device pull
+
+	git -C ../code_app clean -df
+	git -C ../code_app checkout .
+	git -C ../code_app pull
+
+	git -C ../code_lang checkout .
+	git -C ../code_lang pull
+	
+	git -C ../code_log checkout .
+	git -C ../code_log pull
+
 	echo "-----------------------------start code_lang build-----------------------------"
 	./../code_lang/build.sh
 	
@@ -564,9 +587,9 @@ else
        
         	if  [ "$oem" == "hgtool" ];
 		then
-			cp -rf release/$syspath/$cpu/*          					dpkg/$dpkgtype/$oem/opt/apps/$dpkgpath/bin
+			cp -rf release/$syspath/$cpu/*          					dpkg/$dpkgtype/$oem/opt/apps/$dpkgpath/files/bin
 		else
-			cp -rf release/$syspath/$cpu/*          					dpkg/$dpkgtype/$oem/opt/apps/$dpkgpath/lib
+			cp -rf release/$syspath/$cpu/*          					dpkg/$dpkgtype/$oem/opt/apps/$dpkgpath/files/lib
 
 			if  [ "$oem" == "hg" ] || [ "$oem" == "zg" ];
 			then
diff --git a/uos/hgtool/DEBIAN/control b/uos/hgtool/DEBIAN/control
index 03f00a3..b91ffd1 100755
--- a/uos/hgtool/DEBIAN/control
+++ b/uos/hgtool/DEBIAN/control
@@ -1,6 +1,6 @@
-Package: com.huagaochina.huagoscantool
-Version: 4.40.10521.23066
-Architecture: loongarch64
+Package: com.huagaochina.huagaoscantool
+Version: 4.52.10520.24232
+Architecture: amd64
 Section: utils
 Priority: optional
 Maintainer: PengLiangyi <pengliangyi@huagaochina.com>
diff --git a/uos/hgtool/DEBIAN/postinst b/uos/hgtool/DEBIAN/postinst
index 0c2dc6d..49b6882 100755
--- a/uos/hgtool/DEBIAN/postinst
+++ b/uos/hgtool/DEBIAN/postinst
@@ -4,4 +4,4 @@ udevadm control --reload-rules
 udevadm trigger
 ldconfig
 
-/opt/apps/com.huagaochina.huagoscantool/files/bin/HGScanTool &
\ No newline at end of file
+/opt/apps/com.huagaochina.huagaoscantool/files/bin/HGScanTool &
\ No newline at end of file
diff --git a/uos/hgtool/usr/share/applications/scanner-driver-huagaoscantool.desktop b/uos/hgtool/usr/share/applications/com.huagaochina.huagaoscantool.desktop
old mode 100755
new mode 100644
similarity index 76%
rename from uos/hgtool/usr/share/applications/scanner-driver-huagaoscantool.desktop
rename to uos/hgtool/usr/share/applications/com.huagaochina.huagaoscantool.desktop
index 3dd1fc6..7151efb
--- a/uos/hgtool/usr/share/applications/scanner-driver-huagaoscantool.desktop
+++ b/uos/hgtool/usr/share/applications/com.huagaochina.huagaoscantool.desktop
@@ -5,6 +5,6 @@ Type=Application
 Name=HGScanTool
 Name[zh_CN]=华高按键扫描工具
 Exec=/opt/apps/com.huagaochina.huagaoscantool/files/bin/HGScanTool
-Icon=/usr/share/icons/hicolor/128x128/apps/scanner-driver-huagaoscantool.png
+Icon=/usr/share/icons/hicolor/128x128/apps/com.huagaochina.huagaoscantool.png
 Categories=Application;Graphics;GTK;RasterGraphics;Scanning;