From b8c7803751040bb95571c370df78706f0a8eb2fd Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Sat, 15 Aug 2020 11:01:28 -0700 Subject: [PATCH] jobd/git-fetch-q-progress.sh: pick up latest Signed-off-by: Kyle J. McKay --- jobd/git-fetch-q-progress.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jobd/git-fetch-q-progress.sh b/jobd/git-fetch-q-progress.sh index a7feefb..5267a81 100755 --- a/jobd/git-fetch-q-progress.sh +++ b/jobd/git-fetch-q-progress.sh @@ -1,7 +1,7 @@ #!/bin/sh # git-fetch-q-progress.sh - fetch with progress but not ref noise -# Copyright (C) 2017,2018 Kyle J. McKay. All rights reserved. +# Copyright (C) 2017,2018,2020 Kyle J. McKay. All rights reserved. # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -17,13 +17,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# Version 1.0.1 +# Version 1.0.2 set -e -git rev-parse --git-dir >/dev/null || exit +: "${GIT_BIN:=git}" +eval "$GIT_BIN"' rev-parse --git-dir >/dev/null' || exit PERLPROG=' #!perl -#line 27 "git-fetch-q-progress.sh" +#line 28 "git-fetch-q-progress.sh" use strict; use warnings; use Fcntl; @@ -107,7 +108,7 @@ ec= read -r ec <&3 3>&1 1>&4 4>&- - { ec=0 && git fetch --progress "$@" 3>&- || ec=$?; echo $ec >&3; } 2>&1 | + { ec=0 && eval "$GIT_BIN"' fetch --progress "$@" 3>&-' || ec=$?; echo $ec >&3; } 2>&1 | { export PERLPROG && perl -e 'eval $ENV{PERLPROG}'; } >&2 ) EOT -- 2.11.4.GIT