summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhuantian2021-06-22 17:27:42 -0700
committerhuantian2021-06-22 17:27:42 -0700
commit3e6b651fb1f9de998c2bc020211f51b4816f668c (patch)
tree69dcf7f44f5ca0374ef6e95fc5031e1f324f31de
parentc618f5f225cf8867a84bf43d69251b03b27099db (diff)
downloadaur-3e6b651fb1f9de998c2bc020211f51b4816f668c.tar.gz
v1.1.11, big rewrite to make it actually work
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD90
-rw-r--r--gdlauncher.install13
3 files changed, 57 insertions, 62 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9c183d0172ff..ea6352ac9574 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,28 @@
pkgbase = gdlauncher
pkgdesc = GDLauncher is simple, yet powerful Minecraft custom launcher with a strong focus on the user experience
- pkgver = 1.1.7
- pkgrel = 2
+ pkgver = 1.1.11
+ pkgrel = 1
url = https://gdevs.io
arch = x86_64
license = GPL3
makedepends = gendesk
makedepends = git
- makedepends = yarn
makedepends = nodejs
+ makedepends = npm
makedepends = rust
- makedepends = unzip
depends = libnotify
depends = libxss
depends = libxtst
depends = libindicator-gtk3
depends = libappindicator-gtk3
+ depends = electron
+ depends = p7zip
+ provides = gdlauncher
conflicts = gdlauncher-appimage
conflicts = gdlauncher-git
conflicts = gdlauncher-bin
- source = gdlauncher::git+https://github.com/gorilla-devs/GDLauncher.git
- md5sums = SKIP
+ conflicts = gdlauncher-appimage
+ source = https://github.com/gorilla-devs/GDLauncher/archive/refs/tags/v1.1.11.tar.gz
+ md5sums = 59a3149bd07acdc6ae4f4f9d7823034a
pkgname = gdlauncher
-
diff --git a/PKGBUILD b/PKGBUILD
index 48e79d2e46cc..70b22046a7c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,70 @@
# Maintainer: S Stewart <tda@null.net>
# Maintainer: Cranky Supertoon <crankysupertoon@gmail.com>
pkgname="gdlauncher"
-pkgver="1.1.7"
-pkgrel=2
-commitsha="075ea37f447d8961824fae14e7bd4f2c64ea7c9e"
+pkgver="1.1.11"
+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' 'git' 'yarn' 'nodejs' 'rust' 'unzip')
-depends=('libnotify' 'libxss' 'libxtst' 'libindicator-gtk3' 'libappindicator-gtk3')
-conflicts=('gdlauncher-appimage' 'gdlauncher-git' 'gdlauncher-bin')
-source=("gdlauncher::git+https://github.com/gorilla-devs/GDLauncher.git")
-md5sums=('SKIP')
+makedepends=('gendesk' 'git' 'nodejs' 'npm' 'rust')
+depends=('libnotify' 'libxss' 'libxtst' 'libindicator-gtk3' 'libappindicator-gtk3' 'electron' 'p7zip')
+conflicts=('gdlauncher-appimage' 'gdlauncher-git' 'gdlauncher-bin' 'gdlauncher-appimage')
+provides=('gdlauncher')
+source=("https://github.com/gorilla-devs/GDLauncher/archive/refs/tags/v${pkgver}.tar.gz")
+md5sums=('59a3149bd07acdc6ae4f4f9d7823034a')
+icon_sizes=(48 128 256 1024)
prepare() {
- # clone source
- cd "${srcdir}/${pkgname}"
- git checkout origin/master
- git switch master
- git reset --hard ${commitsha}
-
- # generate .desktop
+ # Generate .desktop
gendesk --pkgname "GDLauncher" --pkgdesc "${pkgdesc}" --icon ${pkgname} --exec "/usr/bin/${pkgname}" -n -f
mv "GDLauncher.desktop" "${pkgname}.desktop"
- # put yarn in testing mode
- cd "${srcdir}/${pkgname}"
- echo "RELEASE_TESTING=true" > .env
+ cd "${srcdir}/GDLauncher-${pkgver}/"
+
+ # Apply patches, copied from ObserverOfTime's gdlauncher-git
+ sed -i package.json \
+ -e '/electron-updater/d;/7zip-bin/d' \
+ -e 's$public/electron.js$build/electron.js$' \
+ -e '/"dependencies"/i\ "bundledDependencies": ["7zip-bin"],'
+ patch -p1 -i ../../use-system-7za-and-disable-updater.patch
+ mkdir .git # Husky needs a .git folder to not die
}
build() {
- cd "${srcdir}/${pkgname}"
- yarn
- yarn release
+ cd "${srcdir}/GDLauncher-${pkgver}/"
+
+ # Install required npm packages
+ export CARGO_HOME="${srcdir}/cargo-cache"
+ npm install --cache="${srcdir}"/npm-cache
+
+ # Build the program
+ export CI=false \
+ APP_TYPE=electron \
+ NODE_ENV=production \
+ REACT_APP_RELEASE_TYPE=setup
+ npx craco build
+ npx webpack --config scripts/electronWebpackConfig.js
}
package() {
- # install the main files.
- install -d -m755 "${pkgdir}/opt/${pkgname}"
- cd "${srcdir}/${pkgname}/deploy"
- mkdir gdlauncher/
- unzip "GDLauncher-linux-setup.zip" -d gdlauncher
- cp -Rr "${srcdir}/${pkgname}/deploy/${pkgname}"* "${pkgdir}/opt/"
-
- # desktop entry
- install -D -m644 "${srcdir}/${pkgname}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ # Copy runtime files
+ install -d -m755 "${pkgdir}/usr/lib/gdlauncher/"
+ rm "${srcdir}/GDLauncher-${pkgver}/build/installer"{.nsh,{Header,Sidebar}.bmp} # Unecessary install files
+ cp -r "${srcdir}/GDLauncher-${pkgver}/"{package.json,build} "${pkgdir}/usr/lib/gdlauncher/"
- # install the icon
- install -d -m755 "${pkgdir}/usr/share/icons/hicolor"
- cp -Rr "${srcdir}/${pkgname}/public/icon.png" "${pkgdir}/usr/share/icons/"
-
- # 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 {} \;
+ # Create run script
+ install -d -m755 "${pkgdir}/usr/bin/"
+ printf '#!/bin/sh\nexec electron /usr/lib/gdlauncher "$@"' > "${pkgdir}/usr/bin/gdlauncher"
+ chmod a+x "${pkgdir}/usr/bin/gdlauncher"
- # make sure the main binary has the right permissions
- chmod +x "${pkgdir}/opt/${pkgname}/${pkgname}"
+ # Desktop entry
+ install -d -m755 "${pkgdir}/usr/share/applications/"
+ install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
- # link the binary
- install -d -m755 "${pkgdir}/usr/bin"
- ln -sr "${pkgdir}/opt/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+ # Install icons
+ for size in "${icon_sizes[@]}"; do
+ install -d -m755 "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/"
+ convert "${srcdir}/GDLauncher-${pkgver}/public/icon.png" -size "${size}/${size}" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png"
+ done
}
diff --git a/gdlauncher.install b/gdlauncher.install
deleted file mode 100644
index f39ea2214987..000000000000
--- a/gdlauncher.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate
- xdg-desktop-menu forceupdate
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- xdg-icon-resource forceupdate
- xdg-desktop-menu forceupdate
-} \ No newline at end of file