change local source name, more icon res

2 files changed, 47 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7899ceb2cf25..8a49dccbfcc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,32 @@
 pkgbase = marktext-bin
 	pkgdesc = A simple and elegant open-source markdown editor that focused on speed and usability.
 	pkgver = 0.14.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://marktext.app
 	arch = x86_64
 	license = MIT
 	provides = marktext
 	conflicts = marktext
 	source = marktext-bin-0.14.0.tar.gz::https://github.com/marktext/marktext/releases/download/v0.14.0/marktext-0.14.0-x64.tar.gz
-	source = marktext-icon-48.png::https://github.com/marktext/marktext/raw/master/resources/icons/48x48/marktext.png
-	source = marktext-icon-64.png::https://github.com/marktext/marktext/raw/master/resources/icons/64x64/marktext.png
-	source = marktext-icon-128.png::https://github.com/marktext/marktext/raw/master/resources/icons/128x128/marktext.png
-	source = marktext-icon-256.png::https://github.com/marktext/marktext/raw/master/resources/icons/256x256/marktext.png
-	source = marktext-icon-512.png::https://github.com/marktext/marktext/raw/master/resources/icons/512x512/marktext.png
-	source = marktext.desktop::https://raw.githubusercontent.com/marktext/marktext/master/resources/linux/marktext.desktop
+	source = marktext-bin-0.14.0.desktop::https://github.com/marktext/marktext/raw/v0.14.0/resources/linux/marktext.desktop
+	source = marktext-bin-16x16.png::https://github.com/marktext/marktext/raw/v0.14.0/resources/icons/16x16/marktext.png
+	source = marktext-bin-24x24.png::https://github.com/marktext/marktext/raw/v0.14.0/resources/icons/24x24/marktext.png
+	source = marktext-bin-32x32.png::https://github.com/marktext/marktext/raw/v0.14.0/resources/icons/32x32/marktext.png
+	source = marktext-bin-48x48.png::https://github.com/marktext/marktext/raw/v0.14.0/resources/icons/48x48/marktext.png
+	source = marktext-bin-64x64.png::https://github.com/marktext/marktext/raw/v0.14.0/resources/icons/64x64/marktext.png
+	source = marktext-bin-128x128.png::https://github.com/marktext/marktext/raw/v0.14.0/resources/icons/128x128/marktext.png
+	source = marktext-bin-256x256.png::https://github.com/marktext/marktext/raw/v0.14.0/resources/icons/256x256/marktext.png
+	source = marktext-bin-512x512.png::https://github.com/marktext/marktext/raw/v0.14.0/resources/icons/512x512/marktext.png
 	sha512sums = 8e485ac0c599d149ab4a04666b8ba58f77c5576d2cf70b5e81d2748d69b3c9d79a92ca9b3d3d7ea6d643f7ef12145ccd4c3a8f093436962161fd73c9704e6ae3
+	sha512sums = 98886b39342ca90fe1c2ff011e612e62c37cba589cd1f8ee71dc8d6df7db1582798cef844cfc6ab50e29f5f2e21edc2a16c88b480298cfd719058e47ff754982
+	sha512sums = 2d700fb2af037ade7c66e328e90eacfec27fe25d3ee42487f00978450a81bc9275622404cad821a41b4f5a767d9f7afbbe614ed7a0ddbc95d879fb57beef79e2
+	sha512sums = 52a8a7f28f620738e06253243e3156d09bc6f9cec6ab49caa2e3674e57be0378d5ab6bc28028ee08caaebd7b197c383ed5f08a5c1c8cb9dce6c9b1c90abb932e
+	sha512sums = 840ec0fc95ebeff29902d984113b91906ca5c3fc598fdd515a9b475a373d0c96bcee0c6bb146c8e99ccef2c616db0ee1ddfc44573d78ce9077b4bc2fab1c41e8
 	sha512sums = 39ee566a087950b88c165903ee00a86ab6f6c7fe9c86d715fdc87af144e47b06713f604e10ff09c0d9dde5a62a160376e20657a5d1dcb68d1b1901f976741336
 	sha512sums = 9bd243eda4888d8ae15991d9595d1dcf7992c00b4193406b7cc7e74ae86c1afcd1948979710494b65d504807a9393edd6c01ff3125776ebf5eb3061f29b57dd4
 	sha512sums = 7b2a5ee74bbc24e10940ac7ef0bf82f9d73c7d981f8d5a90bb58fc857a417176d69a77995b43eb696ddb0d237c11dccd4ae6ed337accc0a27ab54f1bcdc2064d
 	sha512sums = 3461f1c9cb29e103861101dc3ed0c6f24536d99bab78182b12c296a09ce7a9d249620e9788526184311af761a994b846877c84161922a7d0a0355f178d1aa4fc
 	sha512sums = 2effb4e6be7f68f3c55b98c0d7c41a23bf4b1a5e9bf3d1544a5f642ef8764c63cb75bdc98b039278948dd21185899142fc688c6f70a3d38f8e6af54aefbda00c
-	sha512sums = 98886b39342ca90fe1c2ff011e612e62c37cba589cd1f8ee71dc8d6df7db1582798cef844cfc6ab50e29f5f2e21edc2a16c88b480298cfd719058e47ff754982
 
 pkgname = marktext-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 43e054216da6..ccbd3cad7050 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,33 +3,34 @@
 pkgname=marktext-bin
 _pkgname=marktext
 pkgver=0.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple and elegant open-source markdown editor that focused on speed and usability.'
 arch=('x86_64')
 url='https://marktext.app'
 license=('MIT')
 provides=('marktext')
 conflicts=('marktext')
-source=($pkgname-$pkgver.tar.gz::https://github.com/marktext/marktext/releases/download/v$pkgver/$_pkgname-$pkgver-x64.tar.gz
-        $_pkgname-icon-48.png::https://github.com/marktext/marktext/raw/master/resources/icons/48x48/marktext.png
-        $_pkgname-icon-64.png::https://github.com/marktext/marktext/raw/master/resources/icons/64x64/marktext.png
-        $_pkgname-icon-128.png::https://github.com/marktext/marktext/raw/master/resources/icons/128x128/marktext.png
-        $_pkgname-icon-256.png::https://github.com/marktext/marktext/raw/master/resources/icons/256x256/marktext.png
-        $_pkgname-icon-512.png::https://github.com/marktext/marktext/raw/master/resources/icons/512x512/marktext.png
-        $_pkgname.desktop::https://raw.githubusercontent.com/marktext/marktext/master/resources/linux/marktext.desktop
-        )
-sha512sums=('8e485ac0c599d149ab4a04666b8ba58f77c5576d2cf70b5e81d2748d69b3c9d79a92ca9b3d3d7ea6d643f7ef12145ccd4c3a8f093436962161fd73c9704e6ae3'
-            '39ee566a087950b88c165903ee00a86ab6f6c7fe9c86d715fdc87af144e47b06713f604e10ff09c0d9dde5a62a160376e20657a5d1dcb68d1b1901f976741336'
-            '9bd243eda4888d8ae15991d9595d1dcf7992c00b4193406b7cc7e74ae86c1afcd1948979710494b65d504807a9393edd6c01ff3125776ebf5eb3061f29b57dd4'
-            '7b2a5ee74bbc24e10940ac7ef0bf82f9d73c7d981f8d5a90bb58fc857a417176d69a77995b43eb696ddb0d237c11dccd4ae6ed337accc0a27ab54f1bcdc2064d'
-            '3461f1c9cb29e103861101dc3ed0c6f24536d99bab78182b12c296a09ce7a9d249620e9788526184311af761a994b846877c84161922a7d0a0355f178d1aa4fc'
-            '2effb4e6be7f68f3c55b98c0d7c41a23bf4b1a5e9bf3d1544a5f642ef8764c63cb75bdc98b039278948dd21185899142fc688c6f70a3d38f8e6af54aefbda00c'
-            '98886b39342ca90fe1c2ff011e612e62c37cba589cd1f8ee71dc8d6df7db1582798cef844cfc6ab50e29f5f2e21edc2a16c88b480298cfd719058e47ff754982')
+
+_source() {
+  _github=https://github.com/marktext/marktext
+  
+  # Binary tarball
+  echo $pkgname-$pkgver.tar.gz::$_github/releases/download/v$pkgver/$_pkgname-$pkgver-x64.tar.gz
+
+  # Desktop entry
+  echo $pkgname-$pkgver.desktop::$_github/raw/v$pkgver/resources/linux/$_pkgname.desktop
+  
+  # Icons
+  for s in 16 24 32 48 64 128 256 512; do
+    echo $pkgname-${s}x${s}.png::$_github/raw/v$pkgver/resources/icons/${s}x${s}/$_pkgname.png
+  done
+}
+source=($(_source))
 
 prepare() {
   # Change desktop entry to execute /usr/lib/marktext/marktext
   sed -i "s|Exec=.*|Exec=/usr/lib/marktext/marktext %F|" \
-  $srcdir/$_pkgname.desktop
+  $srcdir/$pkgname-$pkgver.desktop
 }
 
 package() {
@@ -37,15 +38,15 @@ package() {
   cp -rT $srcdir/$_pkgname-$pkgver-x64 $pkgdir/usr/lib/$_pkgname
 
   # Install desktop entry
-  install -Dm644 $srcdir/$_pkgname.desktop \
+  install -Dm644 $srcdir/$pkgname-$pkgver.desktop \
   $pkgdir/usr/share/applications/$_pkgname.desktop
 
   # Install icons
-  for s in 48 64 128 256 512; do
-    install -Dm644 $srcdir/$_pkgname-icon-$s.png \
+  for s in 16 24 32 48 64 128 256 512; do
+    install -Dm644 $srcdir/$pkgname-${s}x${s}.png \
     $pkgdir/usr/share/icons/hicolor/${s}x${s}/apps/$_pkgname.png
   done
-  install -Dm644 $srcdir/$_pkgname-icon-512.png \
+  install -Dm644 $srcdir/$pkgname-512x512.png \
   $pkgdir/usr/share/pixmaps/$_pkgname.png
 
   # Install licenses
@@ -54,3 +55,14 @@ package() {
     $pkgdir/usr/share/licenses/$_pkgname/$i
   done
 }
+
+sha512sums=('8e485ac0c599d149ab4a04666b8ba58f77c5576d2cf70b5e81d2748d69b3c9d79a92ca9b3d3d7ea6d643f7ef12145ccd4c3a8f093436962161fd73c9704e6ae3'
+            '98886b39342ca90fe1c2ff011e612e62c37cba589cd1f8ee71dc8d6df7db1582798cef844cfc6ab50e29f5f2e21edc2a16c88b480298cfd719058e47ff754982'
+            '2d700fb2af037ade7c66e328e90eacfec27fe25d3ee42487f00978450a81bc9275622404cad821a41b4f5a767d9f7afbbe614ed7a0ddbc95d879fb57beef79e2'
+            '52a8a7f28f620738e06253243e3156d09bc6f9cec6ab49caa2e3674e57be0378d5ab6bc28028ee08caaebd7b197c383ed5f08a5c1c8cb9dce6c9b1c90abb932e'
+            '840ec0fc95ebeff29902d984113b91906ca5c3fc598fdd515a9b475a373d0c96bcee0c6bb146c8e99ccef2c616db0ee1ddfc44573d78ce9077b4bc2fab1c41e8'
+            '39ee566a087950b88c165903ee00a86ab6f6c7fe9c86d715fdc87af144e47b06713f604e10ff09c0d9dde5a62a160376e20657a5d1dcb68d1b1901f976741336'
+            '9bd243eda4888d8ae15991d9595d1dcf7992c00b4193406b7cc7e74ae86c1afcd1948979710494b65d504807a9393edd6c01ff3125776ebf5eb3061f29b57dd4'
+            '7b2a5ee74bbc24e10940ac7ef0bf82f9d73c7d981f8d5a90bb58fc857a417176d69a77995b43eb696ddb0d237c11dccd4ae6ed337accc0a27ab54f1bcdc2064d'
+            '3461f1c9cb29e103861101dc3ed0c6f24536d99bab78182b12c296a09ce7a9d249620e9788526184311af761a994b846877c84161922a7d0a0355f178d1aa4fc'
+            '2effb4e6be7f68f3c55b98c0d7c41a23bf4b1a5e9bf3d1544a5f642ef8764c63cb75bdc98b039278948dd21185899142fc688c6f70a3d38f8e6af54aefbda00c')