migrate to extracted method

3 files changed, 33 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8c014eebdf8..b17812e0b715 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
 pkgbase = mcpelauncher-appimage
 	pkgdesc = Minecraft Bedrock Launcher for Linux
 	pkgver = 0.14.1.790
-	pkgrel = 1
-	url = https://mcpelauncher.readthedocs.io
+	pkgrel = 2
+	url = https://github.com/minecraft-linux/appimage-builder
 	arch = x86_64
 	license = GPL3
+	license = MIT
 	depends = fuse2
 	optdepends = zenity: custom skin picker
-	provides = mcpelauncher
-	noextract = mcpelauncher-appimage_0.14.1-790.AppImage
+	provides = mcpelauncher-ui-qt
+	conflicts = mcpelauncher-ui-qt
 	options = !strip
-	source = mcpelauncher-appimage_0.14.1-790.AppImage::https://github.com/minecraft-linux/appimage-builder/releases/download/v0.14.1-790/Minecraft_Bedrock_Launcher-x86_64-v0.14.1.790.AppImage
-	source = mcpelauncher-appimage.png::https://minecraft.wiki/images/Bedrock_Edition_App_Store_icon_2.png
-	source = mcpelauncher.desktop
+	source = https://github.com/minecraft-linux/appimage-builder/releases/download/v0.14.1-790/Minecraft_Bedrock_Launcher-x86_64-v0.14.1.790.AppImage
 	sha256sums = 22ec68127de07573829d8cc6a7049dad6cfcf2a6369a4ded2431c2c88e472a88
-	sha256sums = f885ae28409754af415aec63ce71c134f61dee1d6960c23dbc7b5d7b35dc6d47
-	sha256sums = bc94fe1c6b6849569961e9807baf32e71e1275a0c9b2b589141ca9067b9c4732
 
 pkgname = mcpelauncher-appimage
diff --git a/PKGBUILD b/PKGBUILD
index eaf429bd9c4a..afaa04f2f36a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,39 @@
-## Maintainer: adiprasetya <ignilium.inc@gmail.com>
+## Maintainer: Adi Prasetya <t.me/adiwastaken>
 
 pkgname=mcpelauncher-appimage
+_pkgname=${pkgname/appimage/ui-qt}
 _pkgver=0.14.1-790
 pkgver="${_pkgver/-/.}"
-pkgrel=1
+pkgrel=2
 pkgdesc="Minecraft Bedrock Launcher for Linux"
 arch=("x86_64")
-url="https://mcpelauncher.readthedocs.io"
-license=("GPL3")
-groups=()
+url="https://github.com/minecraft-linux/appimage-builder"
+license=('GPL3' 'MIT')
 depends=(fuse2)
-makedepends=()
-checkdepends=()
 optdepends=('zenity: custom skin picker')
-provides=(mcpelauncher)
-conflicts=()
-replaces=()
-backup=()
+provides=(mcpelauncher-ui-qt)
+conflicts=(mcpelauncher-ui-qt)
 options=(!strip)
-install=
-changelog=
-source=("${pkgname}_${_pkgver}.AppImage::https://github.com/minecraft-linux/appimage-builder/releases/download/v${_pkgver}/Minecraft_Bedrock_Launcher-x86_64-v${pkgver}.AppImage"
-    "${pkgname}.png::https://minecraft.wiki/images/Bedrock_Edition_App_Store_icon_2.png"
-    "mcpelauncher.desktop")
-noextract=("${pkgname}_${_pkgver}.AppImage")
-sha256sums=('22ec68127de07573829d8cc6a7049dad6cfcf2a6369a4ded2431c2c88e472a88'
-            'f885ae28409754af415aec63ce71c134f61dee1d6960c23dbc7b5d7b35dc6d47'
-            'bc94fe1c6b6849569961e9807baf32e71e1275a0c9b2b589141ca9067b9c4732')
+_fileName="Minecraft_Bedrock_Launcher-x86_64-v${pkgver}.AppImage"
+_desktopFile="usr/share/applications/mcpelauncher-ui-qt.desktop"
+_scalableIcon="usr/share/icons/hicolor/scalable/apps/mcpelauncher-ui-qt.svg"
+source=("${url}/releases/download/v${_pkgver}/${_fileName}")
+sha256sums=('22ec68127de07573829d8cc6a7049dad6cfcf2a6369a4ded2431c2c88e472a88')
+
+prepare() {
+    rm -rf "${srcdir}/squashfs-root"
+    chmod +x ${srcdir}/${_fileName}
+    ${srcdir}/${_fileName} --appimage-extract
+    desktop-file-edit --set-key="Exec" --set-value="/usr/bin/mcpelauncher-ui-qt %U" "${srcdir}/squashfs-root/${_desktopFile}"
+}
 
 package() {
-    # Install icon
-    install -Dm644 "${srcdir}"/${pkgname}.png "${pkgdir}"/usr/share/pixmaps/${pkgname}.png
-    # Install desktop file
-    install -Dm644 mcpelauncher.desktop "${pkgdir}"/usr/share/applications/mcpelauncher.desktop
-    # Install binary
-    install -Dm755 "${srcdir}"/"${pkgname}"_"${_pkgver}".AppImage "${pkgdir}"/usr/bin/mcpelauncher
+    # Install icon & desktop
+    install -Dm644 "${srcdir}/squashfs-root/${_scalableIcon}" "${pkgdir}/${_scalableIcon}"
+    install -Dm644 "${srcdir}/squashfs-root/${_desktopFile}" "${pkgdir}/${_desktopFile}"
+    # Install source
+    install -dm755 "${pkgdir}/opt/${_pkgname}"
+    install -dm755 "${pkgdir}/usr/bin"
+    cp -r --target-directory="${pkgdir}/opt/${_pkgname}" "${srcdir}/squashfs-root/."
+    ln -s "/opt/${_pkgname}/usr/bin/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
 }
diff --git a/mcpelauncher.desktop b/mcpelauncher.desktop
deleted file mode 100644
index e74e7cc4ae25..000000000000
--- a/mcpelauncher.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Categories=Game;
-Comment[en_US]=Bedrock Launcher for Linux
-Comment=Bedrock Launcher for Linux
-Exec=/usr/bin/mcpelauncher
-GenericName[en_US]=Bedrock Launcher for Linux
-GenericName=Bedrock Launcher for Linux
-Icon=/usr/share/pixmaps/mcpelauncher-appimage.png
-MimeType=
-Name[en_US]=Minecraft Bedrock Launcher
-Name=Minecraft Bedrock Launcher
-Path=
-StartupNotify=false
-Terminal=false
-TerminalOptions=
-Type=Application
-X-DBUS-ServiceName=
-X-DBUS-StartupType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=