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 $*