Re: [PATCH 1/2] mergetools: create mergetool_find_win32_cmd() helper function for winmerge
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:08:58
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH 1/2] mergetools: create mergetool_find_win32_cmd() helper function for winmerge · Jacob Nisnevich <hidden>
Jacob Nisnevich [off-list ref] writes:
quoted hunk
Signed-off-by: Jacob Nisnevich <redacted> --- git-mergetool--lib.sh | 25 +++++++++++++++++++++++++ mergetools/winmerge | 21 +-------------------- 2 files changed, 26 insertions(+), 20 deletions(-)diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 54ac8e4..c5fa820 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh@@ -372,3 +372,28 @@ get_merge_tool () { fi echo "$merge_tool" } + +mergetool_find_win32_cmd () { + executable=$1 + folder=$2 + + # Use executable.com if it exists in $PATH
s/executable.com/$executable/
+ if type -p $executable >/dev/null 2>&1
This needs to be quoted, if type -p "$executable" >/dev/null 2>&1
+ then + printf '%s' $executable
Likewise.
+ return + fi + + # Look for executable in the typical locations + for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' | + cut -d '=' -f 2- | sort -u) + do + if test -n "$directory" && test -x "$directory/$folder/$executable" + then + printf '%s' "$directory/$folder/$executable" + return + fi + done + + printf '%s' $executable
Likewise. Other than these points, I do not see anything wrong in this patch. Thanks. By the way, "directory/folder/stuff" sounds somewhat strange, no?