update to 0.7.1

3 files changed, 28 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 008f72f6a0dc..56675809a873 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = frigoligo-bin
 	pkgdesc = An universal wallabag client made with Flutter.
-	pkgver = 0.7.0
+	pkgver = 0.7.1
 	pkgrel = 1
 	url = https://github.com/casimir/frigoligo
 	arch = x86_64
 	license = MIT
-	makedepends = squashfuse
+	makedepends = gendesk
 	depends = at-spi2-core
 	depends = cairo
 	depends = pango
@@ -14,13 +14,16 @@ pkgbase = frigoligo-bin
 	depends = gtk3
 	depends = libepoxy
 	depends = fontconfig
-	provides = frigoligo=0.7.0
+	provides = frigoligo=0.7.1
 	conflicts = frigoligo
-	source = frigoligo-0.7.0.AppImage::https://github.com/casimir/frigoligo/releases/download/v0.7.0/Frigoligo-v0.7.0-x86_64.AppImage
-	source = LICENSE-0.7.0::https://raw.githubusercontent.com/casimir/frigoligo/v0.7.0/LICENSE
+	noextract = frigoligo-0.7.1.tar.gz
+	source = frigoligo-0.7.1.tar.gz::https://github.com/casimir/frigoligo/releases/download/v0.7.1/Frigoligo-v0.7.1-linux-x64.tar.gz
+	source = LICENSE-0.7.1::https://raw.githubusercontent.com/casimir/frigoligo/v0.7.1/LICENSE
+	source = frigoligo-0.7.1.png::https://raw.githubusercontent.com/casimir/frigoligo/v0.7.1/assets/logos/frigoligo.png
 	source = frigoligo.sh
-	sha256sums = 7647c38417e5a53507b04b7d0d88e67305a55548fdbb688cfd6e399e3be46476
+	sha256sums = 29f41c98268e77d7995e9544e9ef7a5bbd300df7739bb9fd149359f918bbd9f5
 	sha256sums = 3feb1ea09cc75f148e715820992fd28a3881572e3540b629059f22293b2e17db
-	sha256sums = e60237fb5836f4c30d0dd40a1454fc27c4bb1b5dd08e07d090eddcf2c785e3ca
+	sha256sums = 886063acc61302d4ee369f06b6062257883dd4e3f1d6ab199ca8e64db3091491
+	sha256sums = 291aa263592f1db4ff2740682680779f8784601954816eadf6d2d757868ad763
 
 pkgname = frigoligo-bin
diff --git a/PKGBUILD b/PKGBUILD
index 173e32b2cd5e..f5d51eb13c08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=frigoligo-bin
 _pkgname=Frigoligo
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="An universal wallabag client made with Flutter. "
 arch=('x86_64')
@@ -20,26 +20,31 @@ depends=(
     'fontconfig'
 )
 makedepends=(
-    'squashfuse'
+    'gendesk'
 )
+noextract=("${pkgname%-bin}-${pkgver}.tar.gz")
 source=(
-    "${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/v${pkgver}/${_pkgname}-v${pkgver}-${CARCH}.AppImage"
+    "${pkgname%-bin}-${pkgver}.tar.gz::${url}/releases/download/v${pkgver}/${_pkgname}-v${pkgver}-linux-x64.tar.gz"
     "LICENSE-${pkgver}::https://raw.githubusercontent.com/casimir/frigoligo/v${pkgver}/LICENSE"
+    "${pkgname%-bin}-${pkgver}.png::https://raw.githubusercontent.com/casimir/frigoligo/v${pkgver}/assets/logos/frigoligo.png"
     "${pkgname%-bin}.sh"
 )
-sha256sums=('7647c38417e5a53507b04b7d0d88e67305a55548fdbb688cfd6e399e3be46476'
+sha256sums=('29f41c98268e77d7995e9544e9ef7a5bbd300df7739bb9fd149359f918bbd9f5'
             '3feb1ea09cc75f148e715820992fd28a3881572e3540b629059f22293b2e17db'
-            'e60237fb5836f4c30d0dd40a1454fc27c4bb1b5dd08e07d090eddcf2c785e3ca')
+            '886063acc61302d4ee369f06b6062257883dd4e3f1d6ab199ca8e64db3091491'
+            '291aa263592f1db4ff2740682680779f8784601954816eadf6d2d757868ad763')
 build() {
-    chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
-    "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    sed "s|AppRun|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${_pkgname}.desktop"
+    sed -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@runname@|${pkgname%-bin}|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
+    gendesk -q -f -n --categories "Utility" --name "${_pkgname}" --exec "${pkgname%-git} %U"
+    install -Dm755 -d "${srcdir}/opt"
+    bsdtar -xf "${srcdir}/${pkgname%-bin}-${pkgver}.tar.gz" -C "${srcdir}/opt"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm755 -d "${pkgdir}/opt/${pkgname%-bin}"
-    cp -r "${srcdir}/squashfs-root/"* "${pkgdir}/opt/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/squashfs-root/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
-    install -Dm644 "${srcdir}/squashfs-root/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
+    cp -r "${srcdir}/opt" "${pkgdir}"
+    install -Dm644 "${srcdir}/${pkgname%-bin}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    install -Dm644 "${srcdir}/${pkgname%-bin}-${pkgver}.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
     install -Dm644 "${srcdir}/LICENSE-${pkgver}" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
\ No newline at end of file
diff --git a/frigoligo.sh b/frigoligo.sh
index 3b176eaff22f..746929ab6718 100644
--- a/frigoligo.sh
+++ b/frigoligo.sh
@@ -5,4 +5,4 @@ _RUNNAME="${_APPDIR}/@runname@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 cd "${_APPDIR}"
-exec "${_RUNNAME}" "$@" | exit
\ No newline at end of file
+exec "${_RUNNAME}" "$@" || exit $?
\ No newline at end of file