Update PKGBUILD

- Added maintainer
- Moved _python_version to package()
- More string quoting
- Bumped package version

2 files changed, 21 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2437a21825ce..c4889cf7ce3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = grapejuice-git
 	pkgdesc = Simple Wine+Roblox management tool
-	pkgver = 2.2.7
-	pkgrel = 4
+	pkgver = 2.2.9.cd8e5be
+	pkgrel = 1
 	url = https://gitlab.com/brinkervii/grapejuice.git
 	arch = x86_64
 	license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index 15c6c23a23bc..10c51cfdd1a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,10 @@
+# Maintainer: BrinkerVII <brinkervii@gmail.com>
+
 pkgname=grapejuice-git
 _pkgname=grapejuice
 _repository=https://gitlab.com/brinkervii/grapejuice.git
-pkgver=2.2.7
-pkgrel=4
+pkgver=2.2.9.cd8e5be
+pkgrel=1
 pkgdesc='Simple Wine+Roblox management tool'
 arch=('x86_64')
 url="${_repository}"
@@ -32,22 +34,28 @@ license=('GPL3')
 source=("${_pkgname}"::git+"${_repository}")
 sha256sums=('SKIP')
 
-_python_version=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
+pkgver() {
+  cd "$_pkgname"
+  
+  _commit_id=$(git rev-parse --short HEAD)
+  _grapejuice_version=$(python3 -c 'from grapejuice import __version__; print(__version__)')
+
+  echo "${_grapejuice_version}.${_commit_id}"
+}
 
 package() {
-    project_root=$srcdir/grapejuice
-    pushd "${project_root}"
+    _python_version=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
 
-    export PYTHONPATH=$project_root/src
+    _project_root="$srcdir/grapejuice"
+    cd "${_project_root}" || exit 1
+
+    export PYTHONPATH="$_project_root/src"
     python3 -m grapejuice_packaging linux_package
 
-    built_package_root=${project_root}/dist/linux_package
-    pushd "${built_package_root}"
+    _built_package_root=${_project_root}/dist/linux_package
+    cd "${_built_package_root}" || exit 1
     tar -xf *.tar.gz -C "${pkgdir}"
 
     mv "${pkgdir}/usr/lib/python3/dist-packages" "${pkgdir}/usr/lib/python${_python_version}"
     rm -r "${pkgdir}/usr/lib/python3"
-
-    popd
-    popd
 }
\ No newline at end of file