upgpkg: bats-core 1.2.1-1

upgpkg: bats-core-git v1.2.1.r16.gda118fd-1

upstream release

I replaced the path file with an sed command because the patch file
broke a lot in the past.

3 files changed, 15 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e81cba90ae54..986c24510a40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bats-core
 	pkgdesc = Bash Automated Testing System
-	pkgver = 1.2.0
+	pkgver = 1.2.1
 	pkgrel = 1
 	url = https://github.com/bats-core/bats-core
 	arch = any
@@ -8,10 +8,8 @@ pkgbase = bats-core
 	depends = bash
 	provides = bash-bats
 	conflicts = bash-bats
-	source = bats-core-1.2.0.tar.gz::https://github.com/bats-core/bats-core/archive/v1.2.0.tar.gz
-	source = fix-libexec-path.patch
-	sha256sums = c74ea5517d9381c044e8e87427de0113be6ad591213d489aeaa28146daf1c723
-	sha256sums = 89a7f67f4590abbada4b735174db1e7694cc83a371d4668c3150866340898dbd
+	source = bats-core-1.2.1.tar.gz::https://github.com/bats-core/bats-core/archive/v1.2.1.tar.gz
+	sha256sums = 91c49b1fe6f0656c46491929ed728f8dfa9a96df0cce294963e8c6082bff87a2
 
 pkgname = bats-core
 
diff --git a/PKGBUILD b/PKGBUILD
index 44ac501c7a2e..d8ccc8508dc0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 _name=bats-core
 pkgname=$_name
-pkgver=1.2.0
+pkgver=1.2.1
 _mainfolder=$_name-$pkgver
 pkgrel=1
 pkgdesc='Bash Automated Testing System'
@@ -12,9 +12,8 @@ arch=(any)
 url=https://github.com/bats-core/bats-core
 license=(MIT)
 depends=(bash)
-source=($pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz fix-libexec-path.patch)
-sha256sums=('c74ea5517d9381c044e8e87427de0113be6ad591213d489aeaa28146daf1c723'
-            '89a7f67f4590abbada4b735174db1e7694cc83a371d4668c3150866340898dbd')
+source=($pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz)
+sha256sums=('91c49b1fe6f0656c46491929ed728f8dfa9a96df0cce294963e8c6082bff87a2')
 conflicts=(bash-bats)
 provides=(bash-bats)
 
@@ -26,10 +25,18 @@ check() {
 package() {
   cd "$srcdir/$_mainfolder"
 
-  patch -p1 -i "$srcdir/fix-libexec-path.patch"
+  # In Arch Linux the correct path is /usr/lib and not /usr/libexec, see
+  # https://wiki.archlinux.org/index.php/Arch_package_guidelines#Package_etiquette
+  #
+  # Also rename the bats-core/ folder to bats/
+  sed -i 's/BATS_ROOT\/libexec\/bats-core\/bats/BATS_ROOT\/lib\/bats\/bats/g' bin/bats
+
+  # Rename the bats-core/ folder to bats/
+  sed -i 's/BATS_ROOT\/lib\/bats-core\//BATS_ROOT\/lib\/bats\//g' libexec/bats-core/*
 
   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 "lib/bats-core"/* "$pkgdir/usr/lib/bats"
   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"
diff --git a/fix-libexec-path.patch b/fix-libexec-path.patch
deleted file mode 100644
index bd7416824497..000000000000
--- a/fix-libexec-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/bin/bats b/bin/bats
-index a852306..ce7f883 100755
---- a/bin/bats
-+++ b/bin/bats
-@@ -41,4 +41,4 @@ bats_resolve_absolute_root_dir() {
-
- export BATS_ROOT
- bats_resolve_absolute_root_dir "$0" 'BATS_ROOT'
--exec "$BATS_ROOT/libexec/bats-core/bats" "$@"
-+exec "$BATS_ROOT/lib/bats/bats" "$@"