Update v6.88L

3 files changed, 29 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b2d82f79b38..5d8dddc9e7d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = stc-isp-wine
 	pkgdesc = Wine STC-ISP 下载编程烧录软件
-	pkgver = v6.88F
+	pkgver = v6.88L
 	pkgrel = 1
 	url = http://www.stcmcudata.com
 	install = stc-isp-wine.install
@@ -8,19 +8,18 @@ pkgbase = stc-isp-wine
 	license = unknow
 	makedepends = unarchiver
 	depends = wine
-	depends = wqy-zenhei
+	depends = wqy-microhei
 	depends = winetricks
 	optdepends = wine-mono-gecko-version-fix: Fix the version numbers of wine-mono and wine-gecko files to solve the dialog box that pops up when starting wine.
-	provides = stc-isp-wine
-	conflicts = stc-isp-wine
+	provides = STC-ISP
 	conflicts = stc-isp
 	conflicts = stc-isp-bin
 	replaces = stc-isp-bin
-	noextract = stc-isp-v6.88F.zip
+	noextract = stc-isp-v6.88L.zip
 	options = !strip
-	source = stc-isp-v6.88F.zip::http://www.stcmcudata.com/STCISP/stc-isp-15xx-v6.88F.zip
+	source = stc-isp-v6.88L.zip::http://www.stcmcudata.com/STCISP/stc-isp-15xx-v6.88L.zip
 	source = stc-isp-wine.install
-	sha256sums = f5a0499c37048ec1311048b61b0c17c883226133d56708e931496e06dd706e34
+	sha256sums = 741c7375c173c187a4172156dc2d6eb1f7b9196b0757bad6a0e5fd0da6a2ba50
 	sha256sums = b2a93211b74f6e23a9c4dd508c65bf374c0a03c11174092f6ccec3e9194e47a6
 
 pkgname = stc-isp-wine
diff --git a/.gitignore b/.gitignore
index 25928c4443d7..72e8ffc0db8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1 @@
-src
-pkg
-xboot
-*.deb
-*.rpm
-*.bz2
-*.gz
-*.zip
-*.tgz
-*.pkg.tar.xz
-*.pkg.tar.zst
-*.log
-*.png
+*
diff --git a/PKGBUILD b/PKGBUILD
index aabf6ac036e7..03d1822f65d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: taotieren <admin@taotieren.com>
 
 pkgname=stc-isp-wine
-pkgver=v6.88F
+pkgver=v6.88L
 pkgrel=1
 pkgdesc="Wine STC-ISP 下载编程烧录软件"
 arch=('any')
 url="http://www.stcmcudata.com"
 license=('unknow')
-provides=(${pkgname})
-conflicts=(${pkgname} ${pkgname%-wine} 'stc-isp-bin')
+provides=('STC-ISP')
+conflicts=( ${pkgname%-wine} 'stc-isp-bin')
 replaces=('stc-isp-bin')
-depends=('wine' 'wqy-zenhei' 'winetricks')
+depends=('wine' 'wqy-microhei' 'winetricks')
 optdepends=("wine-mono-gecko-version-fix: Fix the version numbers of wine-mono and wine-gecko files to solve the dialog box that pops up when starting wine.")
 makedepends=('unarchiver')
 backup=()
@@ -18,7 +18,7 @@ options=('!strip')
 install=${pkgname}.install
 source=("${pkgname%-wine}-${pkgver}.zip::${url}/STCISP/${pkgname%-wine}-15xx-${pkgver}.zip"
         "${pkgname}.install")
-sha256sums=('f5a0499c37048ec1311048b61b0c17c883226133d56708e931496e06dd706e34'
+sha256sums=('741c7375c173c187a4172156dc2d6eb1f7b9196b0757bad6a0e5fd0da6a2ba50'
             'b2a93211b74f6e23a9c4dd508c65bf374c0a03c11174092f6ccec3e9194e47a6')
 noextract=("${pkgname%-wine}-${pkgver}.zip")
 
@@ -30,11 +30,11 @@ package() {
     export LC_CTYPE="zh_CN.UTF-8"
 
     _stc="opt/STCMCU"
-    _ftname="wqy-zenhei.ttc"
+    _ftname="wqy-microhei.ttc"
 
     install -dm0755 "${pkgdir}/${_stc}/${pkgname%-wine}"
 
-    cp -ra ${srcdir}/${pkgname%-wine}-${pkgver}/* "${pkgdir}/${_stc}/${pkgname%-wine}"
+    cp -ra "${srcdir}/${pkgname%-wine}-${pkgver}/${pkgname%-wine}-${pkgver}.exe" "${pkgdir}/${_stc}/${pkgname%-wine}"
 
     find "${pkgdir}/${_stc}" -type f -exec chmod 644 "{}" \;
     find "${pkgdir}/${_stc}" -type d -exec chmod 755 "{}" \;
@@ -90,11 +90,24 @@ REGEDIT4
 "COM4"="/dev/ttyUSB3"
 "COM5"="/dev/ttyUSB4"
 "COM6"="/dev/ttyUSB5"
-"COM7"="/dev/ttyACM0"
+"COM7"="/dev/ttyUSB6"
+"COM8"="/dev/ttyUSB7"
+"COM9"="/dev/ttyUSB8"
+"COM10"="/dev/ttyACM0"
+"COM11"="/dev/ttyACM1"
+"COM12"="/dev/ttyACM2"
+"COM13"="/dev/ttyACM3"
+"COM14"="/dev/ttyACM4"
+"COM15"="/dev/ttyACM5"
+"COM16"="/dev/ttyACM6"
+"COM17"="/dev/ttyACM7"
+"COM18"="/dev/ttyACM8"
+"COM19"="/dev/ttyACM9"
 EOF
 
     install -Dm0755 /dev/stdin "${pkgdir}/usr/bin/${pkgname%-wine}" << EOF
 #!/bin/bash
+export LC_CTYPE="zh_CN.UTF-8"
 export WINEARCH=win32 WINEPREFIX="$HOME/.${pkgname%-wine}/wine"
 
 if [ ! -d "$HOME"/.${pkgname%-wine} ] ; then
@@ -103,10 +116,6 @@ if [ ! -d "$HOME"/.${pkgname%-wine} ] ; then
     cp -r /${_stc}/${pkgname%-wine}/regpatch.reg "$HOME"/.${pkgname%-wine}/wine || exit 1
 
     ln -s /${_stc}/${pkgname%-wine}/${pkgname%-wine}-${pkgver}.exe "$HOME"/.${pkgname%-wine}/${pkgname%-wine} || exit 1
-    ln -s -T /${pkgdir}/${_stc}/${pkgname%-wine}/"STC-USB Driver" "$HOME"/.${pkgname%-wine}/"STC-USB Driver" || exit 1
-    ln -s -T /${_stc}/${pkgname%-wine}/"USB to UART Driver" "$HOME"/.${pkgname%-wine}/"USB to UART Driver" || exit 1
-    ln -s -T /${_stc}/${pkgname%-wine}/"STC-USB驱动安装说明.pdf" "$HOME"/.${pkgname%-wine}/"STC-USB驱动安装说明.pdf" || exit 1
-    ln -s -T /${_stc}/${pkgname%-wine}/readme.txt "$HOME"/.${pkgname%-wine}/readme.txt || exit 1
 fi
 
 if [ ! -f "$HOME"/.${pkgname%-wine}/regpatchok ] ; then
@@ -115,7 +124,7 @@ if [ ! -f "$HOME"/.${pkgname%-wine}/regpatchok ] ; then
     winetricks -q mfc42
 fi
 
-wine "$HOME"/.${pkgname%-wine}/${pkgname%-wine} "$@"
+wine "$HOME"/.${pkgname%-wine}/${pkgname%-wine} "\$@"
 EOF
 
     install -Dm0644 /dev/stdin "${pkgdir}/usr/share/applications/${pkgname%-wine}.desktop" << EOF