Update serialtool-git

3 files changed, 18 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 132307feeef2..3514d7ccc18a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = serialtool-git
 	pkgdesc = A practical Serial-Port/TCP/UDP debugging tool.
-	pkgver = 1.4.0alpha.0.22.g48a0fcb
+	pkgver = v1.5.5.r0.ge7c9f72
 	pkgrel = 1
 	url = https://github.com/HoGC/SerialTool
 	install = serialtool-git.install
@@ -22,9 +22,6 @@ pkgbase = serialtool-git
 	conflicts = serialtool
 	options = !strip
 	source = SerialTool::git+https://github.com/HoGC/SerialTool.git
-	source = serialtool
 	sha256sums = SKIP
-	sha256sums = b93065b98d21ce9054da53004edf703d7801fe7657583f4f594eb04f25df672c
 
 pkgname = serialtool-git
-
diff --git a/PKGBUILD b/PKGBUILD
index e61c85cb9071..afb407e1bbd0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
 # Maintainer: taotieren <admin@taotieren.com>
 _pkgname=SerialTool
 pkgname=serialtool-git
-_softname=serialtool
-pkgver=1.4.0alpha.0.22.g48a0fcb
+pkgver=v1.5.5.r0.ge7c9f72
 pkgrel=1
 pkgdesc="A practical Serial-Port/TCP/UDP debugging tool."
 arch=('any')
@@ -17,13 +16,13 @@ backup=()
 options=('!strip')
 install=${pkgname}.install
 source=("${_pkgname}::git+https://github.com/HoGC/${_pkgname}.git"
-    ${_softname})
+        "${pkgname}.install")
 sha256sums=('SKIP'
-    'b93065b98d21ce9054da53004edf703d7801fe7657583f4f594eb04f25df672c')
+            '303f34246c0d341e1093d6e486e2cbfdbbb0d122d751de649f562ebac37777b4')
 
 pkgver() {
     cd "${srcdir}/${_pkgname}/${_pkgname}"
-    git describe --tag | sed -e 's/^[^0-9]*//' -e 's/-/.0./' -e 's/-/./g'
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
@@ -33,20 +32,24 @@ build() {
 }
 
 package() {
-
     install -dm755 "${pkgdir}/usr/bin/" \
-                   "${pkgdir}/usr/share/${_softname}/"
+                   "${pkgdir}/usr/share/${pkgname%-git}/"
 
     cd ${srcdir}/${_pkgname}/${_pkgname}/
-    cp --preserve=mode -r ${_pkgname} language config themes slave  "${pkgdir}/usr/share/${_softname}/"
+    cp --preserve=mode -r ${_pkgname} language config themes slave  "${pkgdir}/usr/share/${pkgname%-git}/"
 
     cd pkg/
     cp --preserve=mode -r icons "${pkgdir}/usr/share/"
 
-    #ln -sf  "/usr/share/${_softname}/${_pkgname}" "${pkgdir}/usr/bin/${_softname}"
-    install -Dm755 "${srcdir}/${_softname}" "${pkgdir}/usr/bin/${_softname}"
-    install -Dm644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_softname}/LICENSE"
-    install -Dm644 "${srcdir}/${_pkgname}/${_pkgname}/pkg/io.github.skiars.${_softname}.desktop" "${pkgdir}/usr/share/applications/io.github.skiars.${_softname}.desktop"
-    install -Dm644 "${srcdir}/${_pkgname}/${_pkgname}/pkg/20-usb-serial.rules" "${pkgdir}/etc/udev/rules.d/20-usb-serial.rules"
-    install -Dm644 "${srcdir}/${_pkgname}/${_pkgname}/pkg/io.github.skiars.${_softname}.metainfo.xml" "${pkgdir}/usr/share/metainfo/io.github.skiars.${_softname}.metainfo.xml"
+    install -Dm0755 /dev/stdin "${pkgdir}/usr/bin/${pkgname%-git}" << EOF
+#!/bin/env bash
+# add lib path
+APP_PATH=/usr/share/serialtool
+cd $APP_PATH
+./SerialTool
+EOF
+    install -Dm0644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname%-git}/LICENSE"
+    install -Dm0644 "${srcdir}/${_pkgname}/${_pkgname}/pkg/io.github.skiars.${pkgname%-git}.desktop" "${pkgdir}/usr/share/applications/io.github.skiars.${pkgname%-git}.desktop"
+    install -Dm0644 "${srcdir}/${_pkgname}/${_pkgname}/pkg/20-usb-serial.rules" "${pkgdir}/etc/udev/rules.d/20-usb-serial.rules"
+    install -Dm0644 "${srcdir}/${_pkgname}/${_pkgname}/pkg/io.github.skiars.${pkgname%-git}.metainfo.xml" "${pkgdir}/usr/share/metainfo/io.github.skiars.${pkgname%-git}.metainfo.xml"
 }
diff --git a/serialtool b/serialtool
deleted file mode 100755
index aeacdd43feff..000000000000
--- a/serialtool
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/env bash
-# add lib path
-APP_PATH=/usr/share/serialtool
-cd $APP_PATH
-./SerialTool