fix errors

2 files changed, 16 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eed17a5aa182..74db12b7a89d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = air-controller-desktop-appimage
 	pkgdesc = A new handy and powerful Android phone assistant,powered by Flutter.
 	pkgver = 0.4.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://ac.yhdm360.cn/
 	arch = x86_64
 	license = MIT
 	depends = zlib
-	depends = hicolor-icon-theme
 	depends = glibc
 	options = !strip
 	source = air-controller-0.4.0.AppImage::https://github.com/air-controller/air-controller-desktop/releases/download/0.4.0/AirController_0.4.0.AppImage
 	source = LICENSE::https://github.com/air-controller/air-controller-desktop/raw/master/LICENSE
 	sha256sums = 9c81fa659acffa74b7576e5dfbc62486d8131157b9d4bfc2a34bdc567bc080c8
-	sha256sums = 210c46d70ffbee3c0d2c213c64194a0395f3f36c1475c136e222e3ac1e863609
+	sha256sums = 72bf32e1daa153b870aff8200c06521b4d15d7aedba46d4c37570c49cacc1ace
 
 pkgname = air-controller-desktop-appimage
diff --git a/PKGBUILD b/PKGBUILD
index b13dcd6371a9..e2084cdd4bd5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,30 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-_pkgname=air-controller
-pkgname="${_pkgname}-desktop-appimage"
+pkgname="air-controller-desktop-appimage"
 _appname=air_controller
 pkgver=0.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A new handy and powerful Android phone assistant,powered by Flutter."
 arch=('x86_64')
 url="http://ac.yhdm360.cn/"
 _githuburl="https://github.com/air-controller/air-controller-desktop"
 license=('MIT')
 options=(!strip)
-providers=("${_pkgname}")
-conflits=("${_pkgname}")
-depends=(zlib hicolor-icon-theme glibc)
-source=("${_pkgname}-${pkgver}.AppImage::${_githuburl}/releases/download/${pkgver}/AirController_${pkgver}.AppImage"
+providers=("${pkgname%-desktop-appimage}")
+conflits=("${pkgname%-desktop-appimage}" "${pkgname%-appimage}")
+depends=('zlib' 'glibc')
+source=("${pkgname%-desktop-appimage}-${pkgver}.AppImage::${_githuburl}/releases/download/${pkgver}/AirController_${pkgver}.AppImage"
     "LICENSE::${_githuburl}/raw/master/LICENSE")
 sha256sums=('9c81fa659acffa74b7576e5dfbc62486d8131157b9d4bfc2a34bdc567bc080c8'
-            '210c46d70ffbee3c0d2c213c64194a0395f3f36c1475c136e222e3ac1e863609')
+            '72bf32e1daa153b870aff8200c06521b4d15d7aedba46d4c37570c49cacc1ace')
 _install_path="/opt/appimages"
 prepare() {
-    chmod a+x "${_pkgname}-${pkgver}.AppImage"
-    "./${_pkgname}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    sed 's/air_controller_desktop/\/opt\/appimages\/air-controller.AppImage/g' -i "${srcdir}/squashfs-root/${_appname}.desktop"
+    chmod a+x "${pkgname%-desktop-appimage}-${pkgver}.AppImage"
+    "./${pkgname%-desktop-appimage}-${pkgver}.AppImage" --appimage-extract > /dev/null
+    sed 's|air_controller_desktop|/opt/appimages/air-controller.AppImage|g' -i "${srcdir}/squashfs-root/${_appname}.desktop"
 }
 package() {
-    install -Dm755 "${srcdir}/${_pkgname}-${pkgver}.AppImage" "${pkgdir}/${_install_path}/${_pkgname}.AppImage"
-    install -Dm644 "${srcdir}/squashfs-root/${_appname}.png" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.png"
-    install -Dm644 "${srcdir}/squashfs-root/${_appname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-    install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm755 "${srcdir}/${pkgname%-desktop-appimage}-${pkgver}.AppImage" "${pkgdir}/${_install_path}/${pkgname%-desktop-appimage}.AppImage"
+    install -Dm644 "${srcdir}/squashfs-root/${_appname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-desktop-appimage}.png"
+    install -Dm644 "${srcdir}/squashfs-root/${_appname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-desktop-appimage}.desktop"
+    install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file