Click here to go back to the commit logs for zelda-alttd-alpha-git.

Commit:

---

Hash: db7bca0389325825e0fdedf85a21c5be4496d8c5

Message: minor refactoring

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 53a1572..8f5b918 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ generated-by = makedeb
 pkgname = zelda-alttd-git
 pkgbase = zelda-alttd-git
 pkgdesc = The Legend of Zelda: A Link to the Dream - Remake of The Legend of Zelda: Link's Awakening (Git version)
-pkgrel = 2
+pkgrel = 3
 pkgver = 1.f96b5ea
 url = https://www.solarus-games.org/en/games/the-legend-of-zelda-a-link-to-the-dream
 arch = all
@@ -13,14 +13,10 @@ makedepends = git
 makedepends = zip
 source = zelda-alttd-git::git+https://gitlab.com/zeldaforce/zelda-alttd.git
 source = alttd-english::git+https://gitlab.com/grawprog/alttd-english.git
-source = zelda-alttd-git-launcher
-source = zelda-alttd-git.desktop
-source = zelda-alttd-git.png
+source = https://gitlab.com/zeldaforce/zelda-alttd/-/raw/dev/data/logos/icon_128.png
 b2sums = SKIP
 b2sums = SKIP
-b2sums = 4d0c654af0434212724915a72cd5e4439c89f95f4fb331c669388b5e65676afd31168f8fe6e99ac04b769d6be05db9e22e61d81af30145d5808fc58d0caeb8fc
-b2sums = 835e6b8db95c6466f21efe733959461b9481d20eb10a970262f0438cc54eabb6deea53011560322f0baf7fe129c1c977076be10f75d86d02988bb0d8bc2df256
-b2sums = b23c6aa20af637e4ae09519f8b770f19ea8f1f774615c8a141b521d1ce859f738c43cf56cc3a0c799a736cdb310415ac576e9afe8b21c95451c8b818226e2442
+b2sums = fe4bf6ce0dbe1c25d943d0dcf5f60d23fee7d168914ced3ca670871ef56911034c9ee471001dd5236593e30a6418dc24d67ade372ad13ff377f939ab5291b4f4
 makedepends = cmake
 makedepends = git
 makedepends = zip
diff --git a/.gitignore b/.gitignore
index 3b79b74..17db327 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 alttd-english/
+error.txt
+icon_128.png
+pkg
+src
 zelda-alttd-git/
 zelda-alttd-git_*
-error.txt      
-src
-pkg
diff --git a/PKGBUILD b/PKGBUILD
index 4a9462c..4d81b9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,9 @@
 # Contributor: Qontinuum (AUR) <qontinuum.dev@protonmail.ch>
 
 pkgname=zelda-alttd-git
+_name="The Legend of Zelda: A Link to the Dream"
 pkgver=1.f96b5ea
-pkgrel=2
+pkgrel=3
 pkgdesc="The Legend of Zelda: A Link to the Dream - Remake of The Legend of Zelda: Link's Awakening (Git version)"
 arch=('all')
 url='https://www.solarus-games.org/en/games/the-legend-of-zelda-a-link-to-the-dream'
@@ -12,14 +13,10 @@ depends=('solarus>=1.6.0')
 makedepends=('cmake' 'git' 'zip')
 source=("$pkgname::git+https://gitlab.com/zeldaforce/zelda-alttd.git"
         "alttd-english::git+https://gitlab.com/grawprog/alttd-english.git"
-        "$pkgname-launcher"
-        "$pkgname.desktop"
-        "$pkgname.png")
+        "https://gitlab.com/zeldaforce/zelda-alttd/-/raw/dev/data/logos/icon_128.png")
 b2sums=('SKIP'
         'SKIP'
-        '4d0c654af0434212724915a72cd5e4439c89f95f4fb331c669388b5e65676afd31168f8fe6e99ac04b769d6be05db9e22e61d81af30145d5808fc58d0caeb8fc'
-        '835e6b8db95c6466f21efe733959461b9481d20eb10a970262f0438cc54eabb6deea53011560322f0baf7fe129c1c977076be10f75d86d02988bb0d8bc2df256'
-        'b23c6aa20af637e4ae09519f8b770f19ea8f1f774615c8a141b521d1ce859f738c43cf56cc3a0c799a736cdb310415ac576e9afe8b21c95451c8b818226e2442')
+        'fe4bf6ce0dbe1c25d943d0dcf5f60d23fee7d168914ced3ca670871ef56911034c9ee471001dd5236593e30a6418dc24d67ade372ad13ff377f939ab5291b4f4')
 
 pkgver() {
   cd "$pkgname"
@@ -28,24 +25,41 @@ pkgver() {
 
 prepare() {
 sed -i 's/set(quest_name "zelda-alttd")/set(quest_name "zelda-alttd-git")/' "$pkgname/CMakeLists.txt"
+cp -R "$srcdir/alttd-english/languages/en/" "$srcdir/zelda-alttd-git/data/languages/"
+sed -i 's!language{ id = "fr", description = "Français" }!language{ id = "en", description = "English" }\nlanguage{ id = "fr", description = "Français" }!' "$srcdir/zelda-alttd-git/data/project_db.dat"
 }
 
 build() {
-  cp -R "$srcdir/alttd-english/languages/en/" "$srcdir/zelda-alttd-git/data/languages/"
-  sed -i 's!language{ id = "fr", description = "Français" }!language{ id = "en", description = "English" }\nlanguage{ id = "fr", description = "Français" }!' "$srcdir/zelda-alttd-git/data/project_db.dat"
   cd "$pkgname"
   cmake -DCMAKE_INSTALL_PREFIX='/usr' .
   make
 }
 
 package() {
-  install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+
+_DESKTOPFILE="[Desktop Entry]
+Version=1.0
+Type=Application
+Name=$_name
+Comment=$pkgdesc
+Exec=$pkgname
+Icon=$pkgname
+Terminal=false
+StartupNotify=false
+Categories=Game;ActionGame;"
+
+  install -m644 -d "$pkgdir/usr/share/applications"
+  echo "$_DESKTOPFILE" > "$pkgdir/usr/share/applications/$pkgname.desktop"
+  chmod 755 "$pkgdir/usr/share/applications/$pkgname.desktop"
+
+  install -Dm644 "icon_128.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
   install -Dm644 $srcdir/$pkgname/ChangeLog "${pkgdir}/usr/share/doc/${pkgname}/changelog"
   install -Dm644 $srcdir/$pkgname/readme.md "${pkgdir}/usr/share/doc/${pkgname}/readme"
   gzip "${pkgdir}/usr/share/doc/${pkgname}/changelog"
 
   cd "$pkgname"
   make DESTDIR="$pkgdir/" install
-  install -Dm755 "../$pkgname-launcher" "$pkgdir/usr/bin/$pkgname"
+
+  echo -e "#!/bin/sh\nsolarus-run /usr/share/solarus/$pkgname/data.solarus $*" > "$pkgdir/usr/bin/$pkgname"
+  chmod 755 "$pkgdir/usr/bin/$pkgname"
 }
diff --git a/zelda-alttd-git-launcher b/zelda-alttd-git-launcher
deleted file mode 100644
index 6071574..0000000
--- a/zelda-alttd-git-launcher
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-solarus-run /usr/share/solarus/zelda-alttd-git $*
diff --git a/zelda-alttd-git.desktop b/zelda-alttd-git.desktop
deleted file mode 100644
index ced2ba2..0000000
--- a/zelda-alttd-git.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=The Legend of Zelda: A Link to the Dream (Git version)
-Comment=Remake of The Legend of Zelda: Link's Awakening (Git version)
-Path=/usr/bin
-Exec=zelda-alttd-git
-Icon=zelda-alttd-git
-Terminal=false
-Categories=Game;
diff --git a/zelda-alttd-git.png b/zelda-alttd-git.png
deleted file mode 100644
index b9ebce5..0000000
Binary files a/zelda-alttd-git.png and /dev/null differ