upgpkg: bats-core-git v1.1.0.r108.g87b16eb-2

3 files changed, 25 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 71db683b074c..912f81d64fe3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bats-core-git
 	pkgdesc = Bash Automated Testing System
-	pkgver = r13.045eb7d
-	pkgrel = 1
+	pkgver = v1.1.0.r108.g87b16eb
+	pkgrel = 2
 	url = https://github.com/bats-core/bats-core
 	arch = any
 	license = MIT
@@ -12,7 +12,7 @@ pkgbase = bats-core-git
 	source = git+https://github.com/bats-core/bats-core
 	source = fix-libexec-path.patch
 	sha256sums = SKIP
-	sha256sums = 2866f0d1a0c3797046d5b0734868281c0f7595cae4f9392ec31e3de9bfb1aa2e
+	sha256sums = 89a7f67f4590abbada4b735174db1e7694cc83a371d4668c3150866340898dbd
 
 pkgname = bats-core-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 761d0dbf6b8a..2defd6c2081c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,25 @@
 
 # All my PKGBUILDs are managed at https://github.com/schra/pkgbuilds
 
-pkgname=bats-core-git
-pkgver=r13.045eb7d
-pkgrel=1
+_name=bats-core
+pkgname=$_name-git
+pkgver=v1.1.0.r108.g87b16eb
+_mainfolder=$_name
+pkgrel=2
 pkgdesc='Bash Automated Testing System'
-arch=('any')
-url='https://github.com/bats-core/bats-core'
-license=('MIT')
-depends=('bash')
-makedepends=('git')
+arch=(any)
+url=https://github.com/bats-core/bats-core
+license=(MIT)
+depends=(bash)
+makedepends=(git)
 source=("git+$url" fix-libexec-path.patch)
 sha256sums=('SKIP'
-            '2866f0d1a0c3797046d5b0734868281c0f7595cae4f9392ec31e3de9bfb1aa2e')
+            '89a7f67f4590abbada4b735174db1e7694cc83a371d4668c3150866340898dbd')
 conflicts=(bash-bats)
 provides=(bash-bats)
 
 pkgver() {
-  cd "$srcdir/$_name"
+  cd "$srcdir/$_mainfolder"
 
   # from https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git
   ( set -o pipefail
@@ -28,19 +30,19 @@ pkgver() {
 }
 
 check() {
-  cd "${srcdir}/bats-core"
+  cd "$srcdir/$_mainfolder"
   bin/bats --tap test
 }
 
 package() {
-  cd "${srcdir}/bats-core"
+  cd "$srcdir/$_mainfolder"
 
-  patch -p1 -i "${srcdir}/fix-libexec-path.patch"
+  patch -p1 -i "$srcdir/fix-libexec-path.patch"
 
-  install -dm755 "${pkgdir}"/{usr/bin,usr/lib/bats,usr/share/man/man{1,7},usr/share/licenses/${pkgname}}
-  install -m 755 "bin"/* "${pkgdir}/usr/bin"
-  install -m 755 "libexec/bats-core"/* "${pkgdir}/usr/lib/bats"
-  install -m 644 "man/bats.1" "${pkgdir}/usr/share/man/man1"
-  install -m 644 "man/bats.7" "${pkgdir}/usr/share/man/man7"
-  install -m 644 LICENSE.md "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.md
+  install -dm755 "$pkgdir"/{usr/bin,usr/lib/bats,usr/share/man/man{1,7},usr/share/licenses/$_name}
+  install -m 755 "bin"/* "$pkgdir/usr/bin"
+  install -m 755 "libexec/bats-core"/* "$pkgdir/usr/lib/bats"
+  install -m 644 "man/bats.1" "$pkgdir/usr/share/man/man1"
+  install -m 644 "man/bats.7" "$pkgdir/usr/share/man/man7"
+  install -m 644 LICENSE.md "$pkgdir"/usr/share/licenses/$_name/LICENSE.md
 }
diff --git a/fix-libexec-path.patch b/fix-libexec-path.patch
index bc8b5c78a39a..bd7416824497 100644
--- a/fix-libexec-path.patch
+++ b/fix-libexec-path.patch
@@ -2,7 +2,7 @@ diff --git a/bin/bats b/bin/bats
 index a852306..ce7f883 100755
 --- a/bin/bats
 +++ b/bin/bats
-@@ -47,4 +47,4 @@ bats_resolve_absolute_root_dir() {
+@@ -41,4 +41,4 @@ bats_resolve_absolute_root_dir() {
 
  export BATS_ROOT
  bats_resolve_absolute_root_dir "$0" 'BATS_ROOT'