Improve PKGBUILD

3 files changed, 36 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ccd26276a1b7..080792c67667 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = shadow-beta
-	pkgdesc = Shadow launcher
-	pkgver = 4.8.2
+	pkgdesc = Shadow Bêta application
+	pkgver = 4.8.6
 	pkgrel = 1
 	url = http://shadow.tech
 	install = shadow-beta.install
@@ -33,8 +33,8 @@ pkgbase = shadow-beta
 	depends = libsndio-61-compat
 	depends = gnome-keyring
 	provides = shadow-beta
-	source = https://update.shadow.tech/launcher/preprod/linux/ubuntu_18.04/ShadowBeta.zip
-	md5sums = 037f85a1ac1c1ddd7d55ee5d0106b565
+	source = shadow-beta-4.8.6-1.zip::https://update.shadow.tech/launcher/preprod/linux/ubuntu_18.04/ShadowBeta.zip
+	md5sums = c2837f61b3b7dd190fcb38a1e9b73c88
 
 pkgname = shadow-beta
 
diff --git a/Makefile b/Makefile
index 4633904db0be..198e444982d6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@ version = 9add3366d25530d51d168608c54b5339b64d2a4e
 help:
 	@grep -E '(^[a-zA-Z_-]+:.*?##.*$$)|(^##)' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[32m%-10s\033[0m %s\n", $$1, $$2}' | sed -e 's/\[32m##/[33m/'
 
-build:clear ## Build pakage
+build:clear ## Builds pakage
 	makepkg -s
 
-clear: ## Clear files
+clear: ## Clears files
 	rm -rf ./pkg
 	rm -rf ./src
 	rm -f ./*.deb
@@ -16,10 +16,10 @@ clear: ## Clear files
 	rm -f ./*~
 	rm -f shadow-beta.zip
 
-install:build ## Install package with pacman
+install:build ## Installs package with pacman
 	sudo pacman -U shadow-beta-*.pkg.tar
 
-pkgsum: ## update pkgsum with updpkgsums
+pkgsum: ## Updates pkgsum with updpkgsums
 	updpkgsums
 
 recup: ## Get git files
@@ -30,8 +30,8 @@ recup: ## Get git files
 release:clear pkgsum srcinfo ## Release preparation
 	git pull
 
-sanity: ## Checking package sanity
+sanity: ## Checkcwqing package sanity
 	namcap shadow-beta-*.pkg.tar
 
-srcinfo: ## génération .SRCINFO
+srcinfo: ## Generates .SRCINFO
 	makepkg --printsrcinfo > .SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index 1bf1a04a5f06..658dd277e045 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,55 +4,63 @@
 # Creator Blade <contact@blade-group.com>
 
 # Made with https://github.com/NicolasGuilloux/blade-shadow-beta
+
 _commit=9add3366d25530d51d168608c54b5339b64d2a4e
 pkgname=shadow-beta
-pkgver=4.8.2
+pkgver=4.8.6
 pkgrel=1
-pkgdesc="Shadow launcher"
+pkgdesc="Shadow Bêta application"
 arch=('x86_64')
 url="http://shadow.tech"
 license=('unknown')
 depends=('desktop-file-utils' 'freetype2' 'libuv' 'gconf' 'hicolor-icon-theme' 'json-c' 'libappindicator-gtk2' 'libbsd' 'libcurl-gnutls' 'libdrm' 'libnotify' 'libva' 'libxtst' 'nss' 'opus' 'qt5-base' 'qt5-svg' 'sdl2' 'libappindicator' 'libcurl-compat' 'sdl' 'gcc7-libs' 'ttf-dejavu' 'libxss' 'libsndio-61-compat' 'gnome-keyring')
 provides=(shadow-beta)
-source=('https://update.shadow.tech/launcher/preprod/linux/ubuntu_18.04/ShadowBeta.zip')
-md5sums=('037f85a1ac1c1ddd7d55ee5d0106b565')
+source=("$pkgname-$pkgver-$pkgrel.zip::https://update.shadow.tech/launcher/preprod/linux/ubuntu_18.04/ShadowBeta.zip")
+md5sums=('c2837f61b3b7dd190fcb38a1e9b73c88')
 install=$pkgname.install
 
-# Build the package
-package() {
-
+# Extract the zip file and prepare for the build
+prepare() {
 	### Create working folder
 	mkdir shadow
 
 	### Extract zip file
-	bsdtar -x -f ShadowBeta.zip -C shadow
+	bsdtar -x -f "$pkgname-$pkgver-$pkgrel.zip" -C shadow
 
 	### Extract the deb
 	ar xv shadow/Shadow*.deb
 
 	### Extract the data
 	bsdtar xf data.tar.xz
+}
 
+# Build the package
+package() {
+	# Move de icons
 	mv "${srcdir}/usr/share/icons/hicolor/0x0/" "${srcdir}/usr/share/icons/hicolor/1024x1024/"
-	mv "${srcdir}/usr/share/icons/hicolor/1024x1024/apps/shadow-preprod.png" "${srcdir}/usr/share/icons/shadow-beta.png"
 
-	chmod -R g-w usr
-	mv usr "${pkgdir}"
+	# Make a copy of the icons
+	echo "cp \"${srcdir}/usr/share/icons/hicolor/1024x1024/apps/*\" \"${srcdir}/usr/share/icons/\""
+	cp ${srcdir}/usr/share/icons/hicolor/1024x1024/apps/* "${srcdir}/usr/share/icons/"
+
+	# Move the files
+	mv "${srcdir}/usr" "${pkgdir}"
+	mv "${srcdir}/opt" "${pkgdir}"
 
-	chmod -R g-w opt
-	mv opt "${pkgdir}"
+	# Fix rights
+	chmod -R g-w "${pkgdir}/usr"
+	chmod -R g-w "${pkgdir}/opt"
 
 	# Move to shortcut directory
 	cd "${pkgdir}/usr/share/applications/"
 
 	sed -i -e 's/^Categories=.*$/Categories=Games;Game;Utility;Virtualization/g' shadow-preprod.desktop
-	sed -i -e 's/^Icon=.*$/Icon=shadow-beta.png/g' shadow-preprod.desktop
 	sed -i -e 's/^Exec=.*$/& --no-sandbox/g' shadow-preprod.desktop
-	mv shadow-preprod.desktop "$srcdir/shadow-beta.desktop"
+	mv shadow-preprod.desktop "${srcdir}/shadow-beta.desktop"
 
 	# Move the source directory
-	cd "$srcdir"
+	cd "${srcdir}"
 
-	chmod g-w shadow-beta.desktop
-	mv shadow-beta.desktop "${pkgdir}/usr/share/applications/shadow-beta.desktop"
+	chmod g-w "${srcdir}/shadow-beta.desktop"
+	mv "${srcdir}/shadow-beta.desktop" "${pkgdir}/usr/share/applications/shadow-beta.desktop"
 }