threads / patch / 37642

patchUse SHELL_PATH as hash bang in test suite askpass helper script.

Subject: [PATCH] Use SHELL_PATH as hash bang in test suite askpass helper script.

## tl;dr

5 messages between Sep 28, 2014 and Sep 29, 2014. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Ben Walton· Sep 28, 2014, 22:21 UTC · lore

The askpass script that is created for use by the test suite should use SHELL_PATH for its hash bang instead of /bin/sh. Commit 5a4352024 introduced the use of idioms not supported in some legacy /bin/sh implementations.

Signed-off-by: Ben Walton <bdwalton@gmail.com>
---
 t/lib-credential.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to t/lib-credential.sh +2 −2

diff --git a/t/lib-credential.sh b/t/lib-credential.sh
index 9e7d796..ca4a6de 100755
--- a/t/lib-credential.sh
+++ b/t/lib-credential.sh
@@ -278,8 +278,8 @@ helper_test_timeout() {
 	'
 }
 
-cat >askpass <<\EOF
-#!/bin/sh
+echo "#!$SHELL_PATH" >askpass
+cat >>askpass <<\EOF
 echo >&2 askpass: $*
 what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z)
 echo "askpass-$what"

-- 
1.9.1

Jeff King· Sep 28, 2014, 23:14 UTC · re: Ben Walton · lore

Re: [PATCH] Use SHELL_PATH as hash bang in test suite askpass helper script.

On Sun, Sep 28, 2014 at 11:21:07PM +0100, Ben Walton wrote:

> The askpass script that is created for use by the test suite should
> use SHELL_PATH for its hash bang instead of /bin/sh. Commit 5a4352024
> introduced the use of idioms not supported in some legacy /bin/sh
> implementations.

Sounds good.

> -cat >askpass <<\EOF
> -#!/bin/sh
> +echo "#!$SHELL_PATH" >askpass
> +cat >>askpass <<\EOF

This can just become:

  write_script askpass <<\EOF

which handles this for us (and you can get rid of the manual chmod then, too).

-Peff

Ben Walton· Sep 29, 2014, 07:02 UTC · re: Jeff King · lore

[PATCH] Ensure SHELL_PATH is the hash bang for test suite askpass helper script.

Use write_script to ensure this happens automatically. This lets us remove the chmod step as well, since write_script handles that.

Signed-off-by: Ben Walton <bdwalton@gmail.com>
---
 t/lib-credential.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Show changes to t/lib-credential.sh +1 −3

diff --git a/t/lib-credential.sh b/t/lib-credential.sh
index 9e7d796..d8e41f7 100755
--- a/t/lib-credential.sh
+++ b/t/lib-credential.sh
@@ -278,12 +278,10 @@ helper_test_timeout() {
 	'
 }
 
-cat >askpass <<\EOF
-#!/bin/sh
+write_script askpass <<\EOF
 echo >&2 askpass: $*
 what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z)
 echo "askpass-$what"
 EOF
-chmod +x askpass
 GIT_ASKPASS="$PWD/askpass"
 export GIT_ASKPASS

-- 
1.9.1

Jeff King· Sep 29, 2014, 17:30 UTC · re: Ben Walton · lore

Re: [PATCH] Ensure SHELL_PATH is the hash bang for test suite askpass helper script.

On Mon, Sep 29, 2014 at 08:02:07AM +0100, Ben Walton wrote:

Show 9 quoted lines

> The askpass script that is created for use by the test suite should
> use SHELL_PATH for its hash bang instead of /bin/sh. Commit 5a4352024
> introduced the use of idioms not supported in some legacy /bin/sh
> implementations.
> 
> Use write_script to ensure this happens automatically. This lets us
> remove the chmod step as well, since write_script handles that.
> 
> Signed-off-by: Ben Walton <bdwalton@gmail.com>

Thanks, this looks good to me.

-Peff

Junio C Hamano· Sep 29, 2014, 17:49 UTC · re: Ben Walton · lore

Re: [PATCH] Ensure SHELL_PATH is the hash bang for test suite askpass helper script.

Ben Walton <bdwalton@gmail.com> writes:

Show 10 quoted lines

> The askpass script that is created for use by the test suite should
> use SHELL_PATH for its hash bang instead of /bin/sh. Commit 5a4352024
> introduced the use of idioms not supported in some legacy /bin/sh
> implementations.
>
> Use write_script to ensure this happens automatically. This lets us
> remove the chmod step as well, since write_script handles that.
>
> Signed-off-by: Ben Walton <bdwalton@gmail.com>
> ---

I'll leave out the "some legacy shells we do not support want to use `command`" from the justification of this change. Use of the write_script helper is the right thing to do---$SHELL_PATH points at the shell the user told us s/he wants to use, and that is a reason enough for this change. The reason why the user wants to use that shell is immaterial.

Thanks.

Show 21 quoted lines

>  t/lib-credential.sh | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/t/lib-credential.sh b/t/lib-credential.sh
> index 9e7d796..d8e41f7 100755
> --- a/t/lib-credential.sh
> +++ b/t/lib-credential.sh
> @@ -278,12 +278,10 @@ helper_test_timeout() {
>  	'
>  }
>  
> -cat >askpass <<\EOF
> -#!/bin/sh
> +write_script askpass <<\EOF
>  echo >&2 askpass: $*
>  what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z)
>  echo "askpass-$what"
>  EOF
> -chmod +x askpass
>  GIT_ASKPASS="$PWD/askpass"
>  export GIT_ASKPASS