From 20e6455559ec73aeb599faa4b1a0837d36a238ce Mon Sep 17 00:00:00 2001 From: Nicolai Skogheim Date: Tue, 28 Jul 2015 06:13:59 +0200 Subject: [PATCH] Pass --import-functions if required This patch is the reason for this commit: https://lists.freebsd.org/pipermail/svn-ports-all/2014-September/075090.html --- bin/git-effort | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/git-effort b/bin/git-effort index 278689b..58c57e4 100755 --- a/bin/git-effort +++ b/bin/git-effort @@ -193,9 +193,18 @@ export -f dates export above export log_args + +bash_params= +# If bash exits sucessfully with --import-functions, +# then we need to pass it (FreeBSD probably) +bash --import-functions -c ":" 1>/dev/null 2>&1 +if [ $? -eq 0 ] ; then + bash_params="--import-functions" +fi + heading # send files to effort -printf "%s\0" "${files[@]}" | xargs -0 -n 1 -P 4 -I % bash -c "effort \"%\"" | tee $tmp +printf "%s\0" "${files[@]}" | xargs -0 -n 1 -P 4 -I % bash $bash_params -c "effort \"%\"" | tee $tmp # if more than one file, sort and print test "$(wc -l $tmp | awk '{print $1}')" -gt 1 && sort_effort