Get rid of _gitroot, _gitbranch and _gitname

2 files changed, 23 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc2af29e0c22..ea6f55153644 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = shim-efi-git
 	pkgdesc = Simple bootloader for x86_64 UEFI Secure Boot - GIT Version
-	pkgver = 0.8.11.g929b5b7
+	pkgver = 0.8.32.g6d4803a
 	pkgrel = 1
 	url = https://github.com/rhinstaller/shim
 	arch = x86_64
@@ -12,9 +12,9 @@ pkgbase = shim-efi-git
 	depends = efivar
 	depends = efibootmgr
 	optdepends = mactel-boot: For bless command in Apple Mac systems
-	provides = shim-efi=0.8.11.g929b5b7
-	provides = shim-efi-x86_64=0.8.11.g929b5b7
-	provides = shim-efi-x86_64-git=0.8.11.g929b5b7
+	provides = shim-efi=0.8.32.g6d4803a
+	provides = shim-efi-x86_64=0.8.32.g6d4803a
+	provides = shim-efi-x86_64-git=0.8.32.g6d4803a
 	conflicts = shim-efi
 	conflicts = shim-efi-x86_64
 	conflicts = shim-efi-x86_64-git
diff --git a/PKGBUILD b/PKGBUILD
index b9d7ea4da5b7..6d7b26a7022c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,10 @@
 # Maintainer: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
-_gitroot="https://github.com/rhinstaller/shim.git"
-_gitname="shim"
-_gitbranch="master"
-
-_pkgname="shim-efi"
+__pkgname="shim"
+_pkgname="${__pkgname}-efi"
 pkgname="${_pkgname}-git"
 
-pkgver=0.8.11.g929b5b7
+pkgver=0.8.32.g6d4803a
 pkgrel=1
 pkgdesc="Simple bootloader for x86_64 UEFI Secure Boot - GIT Version"
 url="https://github.com/rhinstaller/shim"
@@ -22,26 +19,29 @@ optdepends=('mactel-boot: For bless command in Apple Mac systems')
 conflicts=("${_pkgname}" 'shim-efi-x86_64' 'shim-efi-x86_64-git')
 provides=("${_pkgname}=${pkgver}" "shim-efi-x86_64=${pkgver}" "shim-efi-x86_64-git=${pkgver}")
 
-source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
+source=("shim::git+https://github.com/rhinstaller/shim.git#branch=master")
 sha1sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${_gitname}/"
+	cd "${srcdir}/${__pkgname}/"
 	echo "$(git describe --tags)" | sed -e 's|-|.|g'
 }
 
-build() {
+prepare() {
 	
-	rm -rf "${srcdir}/${_gitname}_build/" || true
-	cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
-	
-	cd "${srcdir}/${_gitname}_build/"
+	cd "${srcdir}/${__pkgname}/"
 	
 	git clean -x -d -f
 	echo
 	
-	sed 's|/usr/lib64/gnuefi|/usr/lib|g' -i "${srcdir}/${_gitname}_build/Makefile"
-	sed 's|/usr/lib64|/usr/lib|g' -i "${srcdir}/${_gitname}_build/Makefile"
+	sed 's|/usr/lib64/gnuefi|/usr/lib|g' -i "${srcdir}/${__pkgname}/Makefile"
+	sed 's|/usr/lib64|/usr/lib|g' -i "${srcdir}/${__pkgname}/Makefile"
+	
+}
+
+build() {
+	
+	cd "${srcdir}/${__pkgname}/"
 	
 	unset CFLAGS
 	unset CPPFLAGS
@@ -56,12 +56,11 @@ build() {
 
 package() {
 	
-	cd "${srcdir}/${_gitname}_build"
+	cd "${srcdir}/${__pkgname}/"
 	
-	## Install shim x86_64 UEFI application
 	install -d "${pkgdir}/usr/lib/shim/"
-	install -D -m0644 "${srcdir}/${_gitname}_build/shim.efi" "${pkgdir}/usr/lib/shim/shimx64.efi"
-	install -D -m0644 "${srcdir}/${_gitname}_build/MokManager.efi.signed" "${pkgdir}/usr/lib/shim/MokManager.efi.signed"
-	install -D -m0644 "${srcdir}/${_gitname}_build/fallback.efi.signed" "${pkgdir}/usr/lib/shim/fallback.efi.signed"
+	install -D -m0644 "${srcdir}/${__pkgname}/shim.efi" "${pkgdir}/usr/lib/shim/shimx64.efi"
+	install -D -m0644 "${srcdir}/${__pkgname}/MokManager.efi.signed" "${pkgdir}/usr/lib/shim/MokManager.efi.signed"
+	install -D -m0644 "${srcdir}/${__pkgname}/fallback.efi.signed" "${pkgdir}/usr/lib/shim/fallback.efi.signed"
 	
 }