bcftools: /bash to bash in error messages

[Jason Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Tue Jul 21 15:52:14 2020 -0500
Changeset:	f3cabae6bec503a12b6f8d1c2e0b0081f22b0a76

Modified Files:
	samtools/distinfo
	samtools/patches/patch-test_test.pl

Log Message:
bcftools: /bash to bash in error messages

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f3cabae6bec503a12b6f8d1c2e0b0081f22b0a76

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 samtools/distinfo                   |  2 +-
 samtools/patches/patch-test_test.pl | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs:
diff --git a/samtools/distinfo b/samtools/distinfo
index d8be5c7954..52cef73ca3 100644
--- a/samtools/distinfo
+++ b/samtools/distinfo
@@ -5,4 +5,4 @@ RMD160 (samtools-1.10.tar.gz) = e8d91dfc0970a0faa85d45962f76f831af331007
 SHA512 (samtools-1.10.tar.gz) = 7760a1e8a89780ac80053b136930a8ed0cc130b72c9f66cdc9c211e93b6bcc8923140e7caae9824c81caa4a2bfab3a14280e3e7d7245abeaa6f91f0f96123fda
 Size (samtools-1.10.tar.gz) = 4457760 bytes
 SHA1 (patch-Makefile) = 409ef37ff0730257d82989d866c8cba705e3ef8a
-SHA1 (patch-test_test.pl) = c9b254f5119bd78119e61db78bbbda5699b86598
+SHA1 (patch-test_test.pl) = 7dc29671de06bfa7adadee32538a31d34817579f
diff --git a/samtools/patches/patch-test_test.pl b/samtools/patches/patch-test_test.pl
index 48a756b3e0..ac39ec79dd 100644
--- a/samtools/patches/patch-test_test.pl
+++ b/samtools/patches/patch-test_test.pl
@@ -1,15 +1,21 @@
 $NetBSD$
 
-# bash path
+# Portable bash path
 
 --- test/test.pl.orig	2019-12-06 16:40:42.000000000 +0000
 +++ test/test.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/home/bacon/Pkgsrc/pkg/bin/perl
+ #
+ #    Copyright (C) 2013-2019 Genome Research Ltd.
+ #
 @@ -907,7 +907,7 @@ sub test_usage
      my $command = $args{cmd};
      my $commandpath = $$opts{bin}."/".$command;
      my ($ret,$out,$err) = _cmd("$commandpath $args{redirection}");
 -    if ( $err =~ m/\/bin\/bash.*no.*such/i ) { failed($opts,msg=>$test,reason=>"could not run $commandpath: $out"); return; }
-+    if ( $err =~ m/\/bash.*no.*such/i ) { failed($opts,msg=>$test,reason=>"could not run $commandpath: $out"); return; }
++    if ( $err =~ m/bash.*no.*such/i ) { failed($opts,msg=>$test,reason=>"could not run $commandpath: $out"); return; }
  
      my @sections = ($err =~ m/(^[A-Za-z]+.*?)(?:(?=^[A-Za-z]+:)|\z)/msg);
  
@@ -18,7 +24,7 @@ $NetBSD$
      my ($ret,$out,$err) = _cmd("$commandpath $subcommand $args{redirection}");
  
 -    if ( $err =~ m/\/bin\/bash.*no.*such/i ) { failed($opts,msg=>$test,reason=>"could not run $commandpath $subcommand: $out"); return; }
-+    if ( $err =~ m/\/bash.*no.*such/i ) { failed($opts,msg=>$test,reason=>"could not run $commandpath $subcommand: $out"); return; }
++    if ( $err =~ m/bash.*no.*such/i ) { failed($opts,msg=>$test,reason=>"could not run $commandpath $subcommand: $out"); return; }
  
      if ( $err =~ m/not.*implemented/is ) { failed($opts,msg=>$test,reason=>"subcommand indicates it is not implemented",expect_fail=>1); return; }