From 0f1fac92f458187a6a3efa7a3e6c175c982c7239 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Thu, 6 Jun 2024 14:16:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E4=BA=A7=E7=B3=BB=E7=BB=9F=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E7=B4=AB=E5=85=89=E5=94=AE=E5=90=8E=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh                                      |  4 ++--
 ....unischina.uniscan.ZGFWUpgradeApp.desktop} |  0
 .../com.unischina.uniscan.desktop             |  0
 .../files/bin/UniScan.sh                      |  0
 .../files/bin/ZGFWUpgradeApp.sh               | 19 +++++++++++++++++++
 5 files changed, 21 insertions(+), 2 deletions(-)
 rename uos/zg/opt/apps/com.unischina.uniscan/entries/applications/{com.unischina.uniscan.HGFWUpgrade.desktop => com.unischina.uniscan.ZGFWUpgradeApp.desktop} (100%)
 mode change 100644 => 100755
 mode change 100644 => 100755 uos/zg/opt/apps/com.unischina.uniscan/entries/applications/com.unischina.uniscan.desktop
 mode change 100644 => 100755 uos/zg/opt/apps/com.unischina.uniscan/files/bin/UniScan.sh
 create mode 100755 uos/zg/opt/apps/com.unischina.uniscan/files/bin/ZGFWUpgradeApp.sh

diff --git a/build.sh b/build.sh
index 42bb4d4..2d2c6ff 100755
--- a/build.sh
+++ b/build.sh
@@ -107,7 +107,7 @@ function appbuild()
 	git -C ../code_device pull
 
 	git -C ../code_app clean -df
-	git -C ../code_app checkout .
+	#git -C ../code_app checkout .
 	git -C ../code_app pull
 
 	git -C ../code_lang checkout .
@@ -585,7 +585,7 @@ else
 
     else
 		cp -rf release/$syspath/$cpu/*          					dpkg/$dpkgtype/$oem/opt/apps/$dpkgpath/lib
-		if  [ "$oem" == "hg" ];
+		if  [ "$oem" == "hg" ] || [ "$oem" == "zg" ];
 		then
 			mv dpkg/$dpkgtype/$oem/opt/apps/$dpkgpath/lib/*App 			dpkg/$dpkgtype/$oem/opt/apps/$dpkgpath/bin
 		fi
diff --git a/uos/zg/opt/apps/com.unischina.uniscan/entries/applications/com.unischina.uniscan.HGFWUpgrade.desktop b/uos/zg/opt/apps/com.unischina.uniscan/entries/applications/com.unischina.uniscan.ZGFWUpgradeApp.desktop
old mode 100644
new mode 100755
similarity index 100%
rename from uos/zg/opt/apps/com.unischina.uniscan/entries/applications/com.unischina.uniscan.HGFWUpgrade.desktop
rename to uos/zg/opt/apps/com.unischina.uniscan/entries/applications/com.unischina.uniscan.ZGFWUpgradeApp.desktop
diff --git a/uos/zg/opt/apps/com.unischina.uniscan/entries/applications/com.unischina.uniscan.desktop b/uos/zg/opt/apps/com.unischina.uniscan/entries/applications/com.unischina.uniscan.desktop
old mode 100644
new mode 100755
diff --git a/uos/zg/opt/apps/com.unischina.uniscan/files/bin/UniScan.sh b/uos/zg/opt/apps/com.unischina.uniscan/files/bin/UniScan.sh
old mode 100644
new mode 100755
diff --git a/uos/zg/opt/apps/com.unischina.uniscan/files/bin/ZGFWUpgradeApp.sh b/uos/zg/opt/apps/com.unischina.uniscan/files/bin/ZGFWUpgradeApp.sh
new file mode 100755
index 0000000..fe94a6b
--- /dev/null
+++ b/uos/zg/opt/apps/com.unischina.uniscan/files/bin/ZGFWUpgradeApp.sh
@@ -0,0 +1,19 @@
+#!/bin/sh  
+script_dir=$(cd $(dirname $0);pwd)
+cd $script_dir
+
+appname=`basename $0 | sed s,\.sh$,,` 
+
+dirname=`dirname $0` 
+
+tmp="${dirname#?}"  
+
+if [ "${dirname%$tmp}" != "/" ]; then 
+
+dirname=$PWD/$dirname 
+
+fi  
+echo $dirname
+export LD_LIBRARY_PATH=$dirname/../lib 
+echo $dirname/../lib 
+$dirname/$appname $*