fix errors

2 files changed, 19 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 921f0b2d9367..069cd6a0798d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = moonplayer-appimage
 	pkgdesc = All-in-One video player that can play videos from Youtube, Bilibili etc. as well as local videos.
 	pkgver = 4.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://coslyk.github.io/moonplayer.html
 	arch = x86_64
 	license = GPL3
 	depends = hicolor-icon-theme
 	depends = zlib
+	depends = glibc
 	options = !strip
-	source = moonplayer-4.1.AppImage::https://github.com/coslyk/moonplayer/releases/download/4.1/com.github.coslyk.MoonPlayer_4.1.appImage
+	source = moonplayer-4.1.AppImage::https://github.com/coslyk/moonplayer/releases/download/v4.1/MoonPlayer--x86_64.AppImage
 	sha256sums = b81b809dcbbd4dd9364d7123500b97e29f1a3ed85410700c58ce3235ef4be3de
 
 pkgname = moonplayer-appimage
diff --git a/PKGBUILD b/PKGBUILD
index f93e479de9ec..460673da01e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,30 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-pkgname=moonplayer-appimage
-_pkgname=com.github.coslyk.MoonPlayer
-_installedname=moonplayer
+_pkgname=moonplayer
+pkgname="${_pkgname}-appimage"
+_appname=com.github.coslyk.MoonPlayer
 pkgver=4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="All-in-One video player that can play videos from Youtube, Bilibili etc. as well as local videos."
 arch=("x86_64")
 url="https://coslyk.github.io/moonplayer.html"
 _githuburl="https://github.com/coslyk/moonplayer"
 license=(GPL3)
-conflit=(moonplayer moonplayer-git)
-depends=(hicolor-icon-theme zlib)
+conflit=("${_pkgname}")
+depends=(hicolor-icon-theme zlib glibc)
 options=(!strip)
 _install_path="/opt/appimages"
-source=("${_installedname}-${pkgver}.AppImage::${_githuburl}/releases/download/${pkgver}/${_pkgname}_${pkgver}.appImage")
+source=("${_pkgname}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/MoonPlayer--x86_64.AppImage")
 sha256sums=('b81b809dcbbd4dd9364d7123500b97e29f1a3ed85410700c58ce3235ef4be3de')
 prepare() {
-    chmod a+x "${_installedname}-${pkgver}.AppImage"
-    "./${_installedname}-${pkgver}.AppImage" --appimage-extract
-    sed 's/Exec=moonplayer/Exec=\/opt\/appimages\/moonplayer.AppImage/g' -i "${srcdir}/squashfs-root/${_pkgname}.desktop"
-    sed 's/Icon=com.github.coslyk.MoonPlayer/Icon=moonplayer/g' -i "${srcdir}/squashfs-root/${_pkgname}.desktop"
+    chmod a+x "${_pkgname}-${pkgver}.AppImage"
+    "./${_pkgname}-${pkgver}.AppImage" --appimage-extract > /dev/null
+    sed 's/Exec=moonplayer/Exec=\/opt\/appimages\/moonplayer.AppImage/g;s/Icon=com.github.coslyk.MoonPlayer/Icon=moonplayer/g' -i "${srcdir}/squashfs-root/${_appname}.desktop"
 }
 package() {
-    install -Dm755 "${srcdir}/${_installedname}-${pkgver}.AppImage" "${pkgdir}/${_install_path}/${_installedname}.AppImage"
-    install -Dm644 "${srcdir}/squashfs-root/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_installedname}.desktop"
-    for i in 16x16 24x24 32x32 64x64 128x128;do
-        install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${i}/apps/${_pkgname}.png" \
-            "${pkgdir}/usr/share/icons/hicolor/${i}/apps/${_installedname}.png"
+    install -Dm755 "${srcdir}/${_pkgname}-${pkgver}.AppImage" "${pkgdir}/${_install_path}/${_pkgname}.AppImage"
+    install -Dm644 "${srcdir}/squashfs-root/${_appname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+    for _icons in 16x16 24x24 32x32 64x64 128x128;do
+        install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${_appname}.png" \
+            "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${_pkgname}.png"
     done
-}
+}
\ No newline at end of file