v1.1.15.beta-4, switch to .deb for source

3 files changed, 23 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af4cd8face91..efeee8d5857a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = gdlauncher-beta-bin
 	pkgdesc = GDLauncher is simple, yet powerful Minecraft custom launcher with a strong focus on the user experience
-	pkgver = 1.1.15.beta.3
+	pkgver = 1.1.15.beta.4
 	pkgrel = 1
 	url = https://gdevs.io
 	arch = x86_64
 	license = GPL3
-	makedepends = gendesk
-	makedepends = imagemagick
+	makedepends = tar
+	makedepends = xz
 	depends = libnotify
 	depends = libxss
 	depends = libxtst
@@ -19,9 +19,7 @@ pkgbase = gdlauncher-beta-bin
 	conflicts = gdlauncher-appimage
 	conflicts = gdlauncher-git
 	conflicts = gdlauncher-classic
-	source_x86_64 = GDLauncher-1.1.15.beta.3.zip::https://github.com/gorilla-devs/GDLauncher/releases/download/v1.1.15-beta.3/GDLauncher-linux-setup.zip
-	source_x86_64 = https://github.com/gorilla-devs/GDLauncher/raw/master/public/icon.png
-	md5sums_x86_64 = f91b90233497019718e6309d2c220a0d
-	md5sums_x86_64 = af0ce1364e34f49af3793bf8193c5369
+	source_x86_64 = GDLauncher-1.1.15.beta.4.deb::https://github.com/gorilla-devs/GDLauncher/releases/download/v1.1.15-beta.4/GDLauncher-linux-setup.deb
+	md5sums_x86_64 = 007dd991688b483ae115bb6d9ecdbbc1
 
 pkgname = gdlauncher-beta-bin
diff --git a/.gitignore b/.gitignore
index ccffc85cd5ea..99f3dd656130 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
-GDLauncher-*.zip
-gdlauncher-beta-bin-*-x86_64.pkg.tar.zst
-icon.png
-.directory
+# Source file
+GDLauncher-*.deb
+
+# Building directories, built package, 
 pkg
 src
+gdlauncher-beta-bin-*-x86_64.pkg.tar.zst
+
+# Dolphin directory config file
+.directory
diff --git a/PKGBUILD b/PKGBUILD
index bb6e2ae073a9..79ead793fc9d 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,33 @@
 # Maintainer: David Li <davidtianli@gmail.com>
-# Based on the PKGBUILD gdlauncher-bin
+# Based on the PKGBUILD for gdlauncher-bin
 pkgname="gdlauncher-beta-bin"
 _pkgname="gdlauncher"
-pkgver="1.1.15.beta.3"
-_pkgver="1.1.15-beta.3"  # Used for getting the download url.
+pkgver="1.1.15.beta.4"
+_pkgver="1.1.15-beta.4"  # Upstream version, used in the download url.
 pkgrel=1
 arch=('x86_64')
 pkgdesc="GDLauncher is simple, yet powerful Minecraft custom launcher with a strong focus on the user experience"
 url="https://gdevs.io"
 license=('GPL3')
-makedepends=('gendesk' 'imagemagick')
+makedepends=('tar' 'xz')
 depends=('libnotify' 'libxss' 'libxtst' 'libindicator-gtk3' 'libappindicator-gtk3')
 provides=('gdlauncher')
 conflicts=('gdlauncher' 'gdlauncher-beta' 'gdlauncher-bin' 'gdlauncher-appimage' 'gdlauncher-git' 'gdlauncher-classic')
-source_x86_64=("GDLauncher-${pkgver}.zip::https://github.com/gorilla-devs/GDLauncher/releases/download/v${_pkgver}/GDLauncher-linux-setup.zip"
-               "https://github.com/gorilla-devs/GDLauncher/raw/master/public/icon.png")
-md5sums_x86_64=('f91b90233497019718e6309d2c220a0d'
-                'af0ce1364e34f49af3793bf8193c5369')
-icon_sizes=(48 128 256 1024)
-
-prepare() {
-    # Generate .desktop
-    gendesk --pkgname "GDLauncher" --pkgdesc "${pkgdesc}" --icon ${_pkgname} --exec "/usr/bin/${_pkgname}" --categories "Application;Game" -n -f
-}
+source_x86_64=("GDLauncher-${pkgver}.deb::https://github.com/gorilla-devs/GDLauncher/releases/download/v${_pkgver}/GDLauncher-linux-setup.deb")
+md5sums_x86_64=('007dd991688b483ae115bb6d9ecdbbc1')
 
 package() {
-    # install the main files.
-    install -d -m755 "${pkgdir}/opt/${pkgname}/"
-    cp -r "${srcdir}/"* "${pkgdir}/opt/${pkgname}/"
-    rm "${pkgdir}/opt/${pkgname}/"{icon.png,GDLauncher-${pkgver}.zip,GDLauncher.desktop}  # remove symlinked source files
-
-    # desktop entry
-    install -d -m755 "${pkgdir}/usr/share/applications/"
-    install -D -m644 "${srcdir}/GDLauncher.desktop" "${pkgdir}/usr/share/applications/GDlauncher.desktop"
-
-    # install the icons
-    for size in "${icon_sizes[@]}"; do
-        install -d -m755 "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/"
-        convert "${srcdir}/icon.png" -resize "${size}x${size}" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${_pkgname}.png"
-    done
+    # Extract data folder from .deb archive
+    tar xf "${srcdir}/data.tar.xz" --directory=$pkgdir
 
     # fix file permissions - all files as 644 - directories as 755
     find "${pkgdir}/"{opt,usr} -type d -exec chmod 755 {} \;
     find "${pkgdir}/"{opt,usr} -type f -exec chmod 644 {} \;
 
     # make sure the main binary has the right permissions
-    chmod +x "${pkgdir}/opt/${pkgname}/${_pkgname}"
+    chmod +x "${pkgdir}/opt/GDLauncher/${_pkgname}"
 
     # link the binary
     install -d -m755 "${pkgdir}/usr/bin/"
-    ln -sr "${pkgdir}/opt/${pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+    ln -sr "${pkgdir}/opt/GDLauncher/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
 }