diff --git a/build.sh b/build.sh index ffc930c..30dee43 100755 --- a/build.sh +++ b/build.sh @@ -30,6 +30,7 @@ if [ "$oem" != "hg" ] \ && [ "$oem" != "lscso" ] \ && [ "$oem" != "hwso" ] \ && [ "$oem" != "lscsm" ]\ +&& [ "$oem" != "zj" ]\ && [ "$oem" != "cts" ]; then echo "参数错误:$oem !!!" @@ -216,7 +217,7 @@ syspath="kylin" elif [ "$oem" == "cts" ]; then dpkgpath="scanner-driver-cumtenn" - if [ "$oem" == "zj" ] ; + elif [ "$oem" == "zj" ]; then dpkgpath="scanner-driver-microtek" elif [ "$oem" == "hgweb" ]; @@ -441,25 +442,14 @@ fi cp -rf dpkg/$syspath/$oem/* backup/$syspath/$oem/$ver -if [ "$oem" == "hg" ] || [ "$oem" == "hgweb" ] || [ "$oem" == "hgso" ]; + + +if [ ! -d "backup/dpkg/$mainverstr.$minver/$time2/$sanelibname" ]; then - dpkgtype="hg" -elif [ "$oem" == "lsc" ] || [ "$oem" == "lscweb" ] || [ "$oem" == "lscso" ] || [ "$oem" == "lscsm" ]; -then - dpkgtype="lsc" -elif [ "$oem" == "cts" ] || [ "$oem" == "ctsweb" ] || [ "$oem" == "ctsso" ]; -then - dpkgtype="cts" -else - dpkgtype="hw" + mkdir -p "backup/dpkg/$mainverstr.$minver/$time2/$sanelibname/" fi - if [ ! -d "backup/dpkg/$mainverstr.$minver/$time2/$dpkgtype" ]; - then - mkdir -p "backup/dpkg/$mainverstr.$minver/$time2/$dpkgtype/" - fi - -dpkg -b backup/$syspath/$oem/$ver backup/dpkg/$mainverstr.$minver/$time2/$dpkgtype/$dpkgpath"_"$ver"_"$dpkgarch.deb +dpkg -b backup/$syspath/$oem/$ver backup/dpkg/$mainverstr.$minver/$time2/$sanelibname/$dpkgpath"_"$ver"_"$dpkgarch.deb getismount if [ $ismount == 0 ]; @@ -470,4 +460,3 @@ then echo $password|sudo -S cp -rf backup/dpkg/$mainverstr.$minver $FIND_FILE/$syspath fi fi - diff --git a/kylin/zj/DEBIAN/control b/kylin/zj/DEBIAN/control index 8412d3d..22737fa 100644 --- a/kylin/zj/DEBIAN/control +++ b/kylin/zj/DEBIAN/control @@ -1,5 +1,5 @@ package: scanner-driver-microtek -Version: 4.37.18521.23016 +Version: 4.37.20521.23034 Architecture: amd64 Section: utils Priority: optional diff --git a/kylin/zj/opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh b/kylin/zj/opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh index b73b58a..45aeb80 100644 --- a/kylin/zj/opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh +++ b/kylin/zj/opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh @@ -13,7 +13,5 @@ dirname=$PWD/$dirname fi export LD_LIBRARY_PATH=$dirname/../lib -export LD_LIBRARY_PATH='/usr/lib/aarch64-linux-gnu' -export LD_LIBRARY_PATH='/usr/lib/aarch64-linux-gnu/sane' $dirname/$appname $* diff --git a/kylin/zj/usr/lib/mips64el-linux-gnu/sane/libsane-hgsane.so.1 b/kylin/zj/usr/lib/mips64el-linux-gnu/sane/libsane-hgsane.so.1 deleted file mode 100644 index 8e75cd5..0000000 Binary files a/kylin/zj/usr/lib/mips64el-linux-gnu/sane/libsane-hgsane.so.1 and /dev/null differ diff --git a/kylin/zj/usr/share/applications/scanner-driver-cumtenn.desktop b/kylin/zj/usr/share/applications/scanner-driver-cumtenn.desktop deleted file mode 100644 index b22b218..0000000 --- a/kylin/zj/usr/share/applications/scanner-driver-cumtenn.desktop +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env xdg-open -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=MicrotekScan -Name[zh_CN]=中晶扫描应用程序 -Exec=sh /opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh -Icon=/usr/share/icons/hicolor/128x128/apps/scanner-driver-microtek.png -Categories=Application;Graphics;GTK;RasterGraphics;Scanning; - diff --git a/kylin/zj/usr/share/icons/hicolor/128x128/apps/scanner-driver-microtekpng b/kylin/zj/usr/share/icons/hicolor/128x128/apps/scanner-driver-microtekpng deleted file mode 100644 index b3df73d..0000000 Binary files a/kylin/zj/usr/share/icons/hicolor/128x128/apps/scanner-driver-microtekpng and /dev/null differ