Update to 3.6.0.2 and adopt desktop entry keys from deb package

3 files changed, 19 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffed90da0a53..fb5a94bd15a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = alice-bin
 	pkgdesc = An educational software that teaches students computer programming in a 3D environment
-	pkgver = 3.6.0.1
+	pkgver = 3.6.0.2
 	pkgrel = 1
-	url = http://www.alice.org
+	url = https://www.alice.org
 	install = alice-bin.install
 	arch = i686
 	arch = x86_64
@@ -13,10 +13,9 @@ pkgbase = alice-bin
 	depends = lib32-libxrandr
 	depends = lib32-libxcursor
 	provides = alice3
-	noextract = alice-bin-3.6.0.1.sh
+	noextract = alice-bin-3.6.0.2.sh
 	options = !strip
-	source = alice-bin-3.6.0.1.sh::http://www.alice.org/wp-content/uploads/2020/10/Alice3_unix_installer_3_6_0_1.sh
-	sha256sums = b2956ad4bc1731a6aa73470199310629851a1d806b7f8f0c2156a545ea5e2b34
+	source = alice-bin-3.6.0.2.sh::https://github.com/TheAliceProject/alice3/releases/download/3.6.0.2/alice3_unix_installer_3_6_0_2+build_662.sh
+	sha512sums = 6ed9536bb69219e09b7ecb45bfcb163aac6e76260b275fae536dbaeaeb46e3b4c4b71fc0d0ce335da592566322b3131fcf8238c78e9e0661915a084662c6f59d
 
 pkgname = alice-bin
-
diff --git a/PKGBUILD b/PKGBUILD
index 14cf82342603..73e5842a51fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,16 @@
-# Maintainer:  Dimitris Kiziridis <ragouel at outlook dot com>
+# Maintainer:  0b100100 <0b100100 at protonmail dot ch>
+# Contributor: Dimitris Kiziridis <ragouel at outlook dot com>
 # Contributor: William Grieshaber <me@zee.li>
 # Contributor: Chris Giles <Chris.G.27 (at) Gmail.com>
 # Contributor: Nathan Owe <ndowens.aur at gmail dot com>
 
 pkgname=alice-bin
-pkgver=3.6.0.1
+pkgver=3.6.0.2
+_build=662
 pkgrel=1
 pkgdesc='An educational software that teaches students computer programming in a 3D environment'
 arch=('i686' 'x86_64')
-url="http://www.alice.org"
+url="https://www.alice.org"
 license=('custom')
 depends=('java-environment=8'
          'xdg-utils'
@@ -18,25 +20,27 @@ depends=('java-environment=8'
 options=('!strip')
 provides=('alice3')
 install=alice-bin.install
-source=("${pkgname}-${pkgver}.sh::http://www.alice.org/wp-content/uploads/2020/10/Alice3_unix_installer_3_6_0_1.sh")
+source=("${pkgname}-${pkgver}.sh::https://github.com/TheAliceProject/alice3/releases/download/${pkgver}/alice3_unix_installer_${pkgver//./_}+build_${_build}.sh")
 noextract=("${pkgname}-${pkgver}.sh")
-sha256sums=('b2956ad4bc1731a6aa73470199310629851a1d806b7f8f0c2156a545ea5e2b34')
+sha512sums=('6ed9536bb69219e09b7ecb45bfcb163aac6e76260b275fae536dbaeaeb46e3b4c4b71fc0d0ce335da592566322b3131fcf8238c78e9e0661915a084662c6f59d')
 
 package() {
   install -d "${pkgdir}/opt" "${pkgdir}/usr/share/applications"
   chmod 755 ${pkgname}-${pkgver}.sh
   ./${pkgname}-${pkgver}.sh -q -dir "$pkgdir/opt/alice"
-  mv "$pkgdir/opt/alice/Alice 3.desktop" "${pkgdir}/usr/share/applications/alice3.desktop"
+  mv "$pkgdir/opt/alice/alice3.desktop" "${pkgdir}/usr/share/applications/alice3.desktop"
   rm "$pkgdir/opt/alice/uninstall"
   sed -i "s@${pkgdir}@@" "${pkgdir}/usr/share/applications/alice3.desktop"
   sed -i "6s@.*@Icon=alice3@" "${pkgdir}/usr/share/applications/alice3.desktop"
-  sed -i "7s@.*@Categories=Application;Development;@" "${pkgdir}/usr/share/applications/alice3.desktop"
-  sed -i "3 a Comment=An IDE for teaching kids programming" "${pkgdir}/usr/share/applications/alice3.desktop"
+  sed -i "7s@.*@Categories=Development;IDE;@" "${pkgdir}/usr/share/applications/alice3.desktop"
+  sed -i "6 a GenericName=Tile Based 3D Development Environment" "${pkgdir}/usr/share/applications/alice3.desktop"
+  sed -i "7 a Comment=Build and program 3D worlds" "${pkgdir}/usr/share/applications/alice3.desktop"
+  sed -i "8 a Terminal=false" "${pkgdir}/usr/share/applications/alice3.desktop"
   sed -i "s|$srcdir||" "${pkgdir}/opt/alice/.install4j/installation.log"
   sed -i "s|$pkgdir||" "${pkgdir}/opt/alice/.install4j/response.varfile"
   sed -i "s|$pkgdir||" "${pkgdir}/opt/alice/.install4j/installation.log"
   sed -i "s|$pkgdir||" "${pkgdir}/opt/alice/.install4j/install.prop"
-  install -Dm644 "${pkgdir}/opt/alice/.install4j/Alice 3.png" "${pkgdir}/usr/share/pixmaps/alice3.png"
+  install -Dm644 "${pkgdir}/opt/alice/.install4j/alice3.png" "${pkgdir}/usr/share/pixmaps/alice3.png"
   install -Dm644 "${pkgdir}/opt/alice/application/EULA_Alice3.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 # vim:set ts=2 sw=2 et:
diff --git a/alice-bin.install b/alice-bin.install
index 8050bb553725..e46a77e42fc2 100644
--- a/alice-bin.install
+++ b/alice-bin.install
@@ -1,6 +1,4 @@
-# Maintainer: Dimitris Kiziridis <ragouel at outlook dot com>
-
 post_install() {
   echo -e "You need to manually set java-environment=8 by running '\e[32marchlinux-java set java-8-openjdk\e[37m' as root."
   echo "If you have a different package providing Java 8, you can replace the above package with the one you have installed."
-}
\ No newline at end of file
+}