From 22aff63653ea6350a2963b75eda3d372ad1fe3ab Mon Sep 17 00:00:00 2001 From: Jiri Malak Date: Wed, 15 Apr 2020 07:27:33 +0200 Subject: setup-user: restore portability Changes in commit 5129e97285 (setup-user: switch to git-var to check if username and e-mail are set, 2019-11-24, v3.17.0-rc1~379^2) now require the `rev` and `cut` tools to be available. Revise the logic to use that approach only when they are available, and otherwise fall back to the previous more portable approach. Co-Author: Brad King --- Utilities/GitSetup/setup-user | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Utilities/GitSetup/setup-user b/Utilities/GitSetup/setup-user index 0b98879..4cbd184 100755 --- a/Utilities/GitSetup/setup-user +++ b/Utilities/GitSetup/setup-user @@ -20,7 +20,14 @@ # Project configuration instructions: NONE for (( ; ; )); do - ident="$(git var GIT_AUTHOR_IDENT 2>/dev/null | rev | cut -d' ' -f3- | rev)" + if type -p rev >/dev/null && type -p cut >/dev/null; then + ident="$(git var GIT_AUTHOR_IDENT 2>/dev/null | rev | cut -d' ' -f3- | rev)" + elif user_name=$(git config --get user.name) && + user_email=$(git config --get user.email); then + ident="$user_name <$user_email>" + else + ident="" + fi if test -n "$ident"; then echo 'Your commits will record as Author: -- cgit v0.12