Click here to go back to the commit logs for yarntown.

Commit:

---

Hash: 6f5a0cf4008ac8e1cf20318e8ec9e091f7fbd000

Message: minor refactoring

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 16b1e16..8e2ffed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ generated-by = makedeb
 pkgname = yarntown
 pkgbase = yarntown
 pkgdesc = A Zeldalike tribute to Bloodborne. Explore the streets of a cursed, gothic town, hunting beasts and uncovering twisted bosses.
-pkgrel = 0
+pkgrel = 1
 pkgver = 1.0.5
 url = https://maxatrillionator.itch.io/yarntown
 arch = all
@@ -10,10 +10,8 @@ depends = solarus>=1.6.0
 license = custom
 noextract = yarntown.solarus
 source = https://github.com/MaxMraz/yarntown/releases/download/v1.0.5/yarntown.solarus
-source = https://github.com/MaxMraz/yarntown/raw/master/medias/icon/icon_128.png
 source = https://github.com/MaxMraz/yarntown/raw/master/credits.txt
 source = https://github.com/MaxMraz/yarntown/raw/master/readme.md
 b2sums = 914b29f34b394f1816e70d1077091f9a96e7ed1189f9b1ab0850813d329791ef5201eae3ac2bf15dcdba083d01d2029cec4e25f617e7df64716ee7602c989850
-b2sums = 59f5d06ff963722266d12c09648bdc88ce51a363006f0b00b5324c6b057074a6e7577c252605dab777ba3639cbacca146f1d59d7edbb01533a7b6aeb5923320c
 b2sums = 18d8d916157dfdeafe5e0ff88ec782916d6cea617fe5963107ef1518f353ad29acb4dda54e4a31af9098868e6c958f38d0b874f5ff4dcb90c02ccd10189048e8
 b2sums = a194d90cb90abfb66bc28146f55980602738ef63bc437f0d8f06ebbd44ce275385c9c9b7b36a014ab463ceb2506393bad6f4dbd45def632758a18f330c43afb1
diff --git a/.gitignore b/.gitignore
index d14c0f1..35b5c60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 error.txt
 src/
 pkg/
-icon_128.png
 readme.md
 credits.txt
 yarntown*
diff --git a/PKGBUILD b/PKGBUILD
index 4e09a5a..a24600c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,17 @@
 pkgname=yarntown
 _pkgname=Yarntown
 pkgver=1.0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="A Zeldalike tribute to Bloodborne. Explore the streets of a cursed, gothic town, hunting beasts and uncovering twisted bosses."
 arch=('all')
 url="https://maxatrillionator.itch.io/yarntown"
 license=('custom')
 depends=('solarus>=1.6.0')
 source=("https://github.com/MaxMraz/${pkgname}/releases/download/v${pkgver}/${pkgname}.solarus"
-        "https://github.com/MaxMraz/${pkgname}/raw/master/medias/icon/icon_128.png"
         "https://github.com/MaxMraz/${pkgname}/raw/master/credits.txt"
         "https://github.com/MaxMraz/${pkgname}/raw/master/readme.md")
 noextract=("${pkgname}.solarus")
 b2sums=('914b29f34b394f1816e70d1077091f9a96e7ed1189f9b1ab0850813d329791ef5201eae3ac2bf15dcdba083d01d2029cec4e25f617e7df64716ee7602c989850'
-        '59f5d06ff963722266d12c09648bdc88ce51a363006f0b00b5324c6b057074a6e7577c252605dab777ba3639cbacca146f1d59d7edbb01533a7b6aeb5923320c'
         '18d8d916157dfdeafe5e0ff88ec782916d6cea617fe5963107ef1518f353ad29acb4dda54e4a31af9098868e6c958f38d0b874f5ff4dcb90c02ccd10189048e8'
         'a194d90cb90abfb66bc28146f55980602738ef63bc437f0d8f06ebbd44ce275385c9c9b7b36a014ab463ceb2506393bad6f4dbd45def632758a18f330c43afb1')
 
@@ -39,10 +37,11 @@ Categories=Game;ActionGame;"
 
 package() {
   cd "${srcdir}"
-  install -Dm0644 ./$pkgname.solarus "$pkgdir/usr/share/solarus/$pkgname/$pkgname.solarus"
+  install -Dm0644 $pkgname.solarus "$pkgdir/usr/share/solarus/$pkgname/$pkgname.solarus"
   install -Dm0755 $pkgname "$pkgdir/usr/bin/$pkgname"
   install -Dm0644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm0644 icon_128.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -m0644 -d "$pkgdir/usr/share/pixmaps"
+  unzip -pjqq $pkgname.solarus logos/icon_128.png > "$pkgdir/usr/share/pixmaps/$pkgname.png"
   install -Dm0644 credits.txt "$pkgdir/usr/share/doc/$pkgname/credits"
   install -Dm0644 readme.md "$pkgdir/usr/share/doc/$pkgname/readme"
   sed -n "/## License/,/## Controls/p" readme.md | head -n -2 > "$pkgdir/usr/share/doc/$pkgname/license"