[PR PATCH] bats-*: install in bats search path

[PR PATCH] bats-*: install in bats search path

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 692 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages spooky-bats
https://github.com/void-linux/void-packages/pull/48215

bats-*: install in bats search path
without this, there are errors like this when running a bats test suite that needs these modules:
```
Could not find library 'bats-assert' relative to test file or in BATS_LIB_PATH
Could not find library 'bats-support' relative to test file or in BATS_LIB_PATH
```

@ahesford 

#### Testing the changes
- I tested the changes in this PR: **YES**



A patch file from https://github.com/void-linux/void-packages/pull/48215.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spooky-bats-48215.patch --]
[-- Type: text/x-diff, Size: 2793 bytes --]

From a352662d7d8ca451adc7f2bcf3e0470eeabe47f9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 14 Jan 2024 15:30:38 -0500
Subject: [PATCH 1/2] bats-support: install in bats search path

---
 srcpkgs/bats-support/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/bats-support/template b/srcpkgs/bats-support/template
index ce147e02af448..5389061cb09d1 100644
--- a/srcpkgs/bats-support/template
+++ b/srcpkgs/bats-support/template
@@ -1,14 +1,14 @@
-# Template file for 'bats-support'.
+# Template file for 'bats-support'
 pkgname=bats-support
 version=0.3.0
-revision=1
+revision=2
 depends="bats"
 checkdepends="$depends"
 short_desc="Supporting library for BATS test helpers"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="CC0-1.0"
 homepage="https://github.com/bats-core/bats-support"
-distfiles="${homepage}/archive/v${version}.tar.gz"
+distfiles="https://github.com/bats-core/bats-support/archive/v${version}.tar.gz"
 checksum=7815237aafeb42ddcc1b8c698fc5808026d33317d8701d5ec2396e9634e2918f
 
 do_check() {
@@ -19,10 +19,10 @@ do_install() {
 	local f
 
 	for f in *.bash; do
-		vinstall "$f" 644 usr/lib/bats-support
+		vinstall "$f" 644 usr/lib/bats/bats-support
 	done
 
 	for f in src/*.bash; do
-		vinstall "$f" 644 usr/lib/bats-support/src
+		vinstall "$f" 644 usr/lib/bats/bats-support/src
 	done
 }

From 3c64098bd4968de2be5888621e245eabfab54bef Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 14 Jan 2024 15:30:39 -0500
Subject: [PATCH 2/2] bats-assert: install in bats search path

---
 srcpkgs/bats-assert/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/bats-assert/template b/srcpkgs/bats-assert/template
index 0ced3b1d9ccc1..05a300383d5a5 100644
--- a/srcpkgs/bats-assert/template
+++ b/srcpkgs/bats-assert/template
@@ -1,14 +1,14 @@
-# Template file for 'bats-assert'.
+# Template file for 'bats-assert'
 pkgname=bats-assert
 version=2.1.0
-revision=1
+revision=2
 depends="bats bats-support"
 checkdepends="$depends"
 short_desc="Common assertions for BATS"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="CC0-1.0"
 homepage="https://github.com/bats-core/bats-assert"
-distfiles="${homepage}/archive/v${version}.tar.gz"
+distfiles="https://github.com/bats-core/bats-assert/archive/v${version}.tar.gz"
 checksum=98ca3b685f8b8993e48ec057565e6e2abcc541034ed5b0e81f191505682037fd
 
 do_check() {
@@ -19,10 +19,10 @@ do_install() {
 	local f
 
 	for f in *.bash; do
-		vinstall "$f" 644 usr/lib/bats-assert
+		vinstall "$f" 644 usr/lib/bats/bats-assert
 	done
 
 	for f in src/*.bash; do
-		vinstall "$f" 644 usr/lib/bats-assert/src
+		vinstall "$f" 644 usr/lib/bats/bats-assert/src
 	done
 }

Re: [PR PATCH] [Updated] bats-*: install in bats search path

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 697 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages spooky-bats
https://github.com/void-linux/void-packages/pull/48215

bats-*: install in bats search path
without this, there are errors like this when running a bats test suite that needs these modules:
```
Could not find library 'bats-assert' relative to test file or in BATS_LIB_PATH
Could not find library 'bats-support' relative to test file or in BATS_LIB_PATH
```

@ahesford 

#### Testing the changes
- I tested the changes in this PR: **YES**



A patch file from https://github.com/void-linux/void-packages/pull/48215.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spooky-bats-48215.patch --]
[-- Type: text/x-diff, Size: 2828 bytes --]

From a352662d7d8ca451adc7f2bcf3e0470eeabe47f9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 14 Jan 2024 15:30:38 -0500
Subject: [PATCH 1/2] bats-support: install in bats search path

---
 srcpkgs/bats-support/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/bats-support/template b/srcpkgs/bats-support/template
index ce147e02af448..5389061cb09d1 100644
--- a/srcpkgs/bats-support/template
+++ b/srcpkgs/bats-support/template
@@ -1,14 +1,14 @@
-# Template file for 'bats-support'.
+# Template file for 'bats-support'
 pkgname=bats-support
 version=0.3.0
-revision=1
+revision=2
 depends="bats"
 checkdepends="$depends"
 short_desc="Supporting library for BATS test helpers"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="CC0-1.0"
 homepage="https://github.com/bats-core/bats-support"
-distfiles="${homepage}/archive/v${version}.tar.gz"
+distfiles="https://github.com/bats-core/bats-support/archive/v${version}.tar.gz"
 checksum=7815237aafeb42ddcc1b8c698fc5808026d33317d8701d5ec2396e9634e2918f
 
 do_check() {
@@ -19,10 +19,10 @@ do_install() {
 	local f
 
 	for f in *.bash; do
-		vinstall "$f" 644 usr/lib/bats-support
+		vinstall "$f" 644 usr/lib/bats/bats-support
 	done
 
 	for f in src/*.bash; do
-		vinstall "$f" 644 usr/lib/bats-support/src
+		vinstall "$f" 644 usr/lib/bats/bats-support/src
 	done
 }

From af570a348e76daa593f7154e1918055aed6cf47b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 14 Jan 2024 15:30:39 -0500
Subject: [PATCH 2/2] bats-assert: install in bats search path

---
 srcpkgs/bats-assert/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/bats-assert/template b/srcpkgs/bats-assert/template
index 0ced3b1d9ccc1..764355e329f8c 100644
--- a/srcpkgs/bats-assert/template
+++ b/srcpkgs/bats-assert/template
@@ -1,28 +1,28 @@
-# Template file for 'bats-assert'.
+# Template file for 'bats-assert'
 pkgname=bats-assert
 version=2.1.0
-revision=1
+revision=2
 depends="bats bats-support"
 checkdepends="$depends"
 short_desc="Common assertions for BATS"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="CC0-1.0"
 homepage="https://github.com/bats-core/bats-assert"
-distfiles="${homepage}/archive/v${version}.tar.gz"
+distfiles="https://github.com/bats-core/bats-assert/archive/v${version}.tar.gz"
 checksum=98ca3b685f8b8993e48ec057565e6e2abcc541034ed5b0e81f191505682037fd
 
 do_check() {
-	BATS_LIB_PATH=/usr/lib bats test
+	bats test
 }
 
 do_install() {
 	local f
 
 	for f in *.bash; do
-		vinstall "$f" 644 usr/lib/bats-assert
+		vinstall "$f" 644 usr/lib/bats/bats-assert
 	done
 
 	for f in src/*.bash; do
-		vinstall "$f" 644 usr/lib/bats-assert/src
+		vinstall "$f" 644 usr/lib/bats/bats-assert/src
 	done
 }

Re: bats-*: install in bats search path

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/48215#issuecomment-1892653480

Comment:
I'm tempted to rewrite these commits to win the `${homepage}` war, but I won't.

Re: [PR PATCH] [Merged]: bats-*: install in bats search path

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 527 bytes --]

There's a merged pull request on the void-packages repository

bats-*: install in bats search path
https://github.com/void-linux/void-packages/pull/48215

Description:
without this, there are errors like this when running a bats test suite that needs these modules:
```
Could not find library 'bats-assert' relative to test file or in BATS_LIB_PATH
Could not find library 'bats-support' relative to test file or in BATS_LIB_PATH
```

@ahesford 

#### Testing the changes
- I tested the changes in this PR: **YES**