Re: [PATCH] Do not require Python for the git-remote-{bzr,hg} placeholder scripts

From: Marc Branchaud <marcnarc@xiplink.com>
Date: Mar 3, 2017, 15:32 UTC
Message-ID: <a9273d37-388a-8c27-1cf1-51e9cb28ef55@xiplink.com>
In-Reply-To: <0102015a93d18443-c574aaf8-5656-49e8-8848-810e1fadc87a-000000@eu-west-1.amazonses.com>

On 2017-03-03 05:57 AM, Sebastian Schuberth wrote:

> It does not make sense for these placeholder scripts to depend on Python
> just because the real scripts do. At the example of Git for Windows, we
> would not even be able to see those warnings as it does not ship with
> Python. So just use plain shell scripts instead.

Just a niggle:  This change moves the warning message from stderr to stdout.

M.

Show 60 quoted lines

> Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
> ---
>  contrib/remote-helpers/git-remote-bzr | 16 +++++++---------
>  contrib/remote-helpers/git-remote-hg  | 16 +++++++---------
>  2 files changed, 14 insertions(+), 18 deletions(-)
>
> diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
> index 712a137..ccc4aea 100755
> --- a/contrib/remote-helpers/git-remote-bzr
> +++ b/contrib/remote-helpers/git-remote-bzr
> @@ -1,13 +1,11 @@
> -#!/usr/bin/env python
> +#!/bin/sh
>
> -import sys
> -
> -sys.stderr.write('WARNING: git-remote-bzr is now maintained independently.\n')
> -sys.stderr.write('WARNING: For more information visit https://github.com/felipec/git-remote-bzr\n')
> -
> -sys.stderr.write('''WARNING:
> +cat <<'EOT'
> +WARNING: git-remote-bzr is now maintained independently.
> +WARNING: For more information visit https://github.com/felipec/git-remote-bzr
> +WARNING:
>  WARNING: You can pick a directory on your $PATH and download it, e.g.:
> -WARNING:   $ wget -O $HOME/bin/git-remote-bzr \\
> +WARNING:   $ wget -O $HOME/bin/git-remote-bzr \
>  WARNING:     https://raw.github.com/felipec/git-remote-bzr/master/git-remote-bzr
>  WARNING:   $ chmod +x $HOME/bin/git-remote-bzr
> -''')
> +EOT
> diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
> index 4255ad6..dfda44f 100755
> --- a/contrib/remote-helpers/git-remote-hg
> +++ b/contrib/remote-helpers/git-remote-hg
> @@ -1,13 +1,11 @@
> -#!/usr/bin/env python
> +#!/bin/sh
>
> -import sys
> -
> -sys.stderr.write('WARNING: git-remote-hg is now maintained independently.\n')
> -sys.stderr.write('WARNING: For more information visit https://github.com/felipec/git-remote-hg\n')
> -
> -sys.stderr.write('''WARNING:
> +cat <<'EOT'
> +WARNING: git-remote-hg is now maintained independently.
> +WARNING: For more information visit https://github.com/felipec/git-remote-hg
> +WARNING:
>  WARNING: You can pick a directory on your $PATH and download it, e.g.:
> -WARNING:   $ wget -O $HOME/bin/git-remote-hg \\
> +WARNING:   $ wget -O $HOME/bin/git-remote-hg \
>  WARNING:     https://raw.github.com/felipec/git-remote-hg/master/git-remote-hg
>  WARNING:   $ chmod +x $HOME/bin/git-remote-hg
> -''')
> +EOT
>
> --
> https://github.com/git/git/pull/333
>