From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 4 Nov 2019 20:24:48 +0000 (+0100)
Subject: patch 8.1.2253: using "which" to check for an executable is not reliable
X-Git-Tag: v8.1.2253
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad4de52510d5b4a949c0c9e25b5d5333744820b3;p=vim

patch 8.1.2253: using "which" to check for an executable is not reliable

Problem:    Using "which" to check for an executable is not reliable.
Solution:   Use "command -v" instead.  Also exit with error code when
            generating tags has an error. (closes #5174)
---

diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 4ca08818d..e10415f9e 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -323,9 +323,9 @@ all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
 # Use Vim to generate the tags file.  Can only be used when Vim has been
 # compiled and installed.  Supports multiple languages.
 vimtags: $(DOCS)
-	@if which $(VIMEXE) >/dev/null; then \
-	  $(VIMEXE) --clean -eX -u doctags.vim >/dev/null; \
-	  echo "help tags updated"; \
+	@if command -v $(VIMEXE); then \
+	    $(VIMEXE) --clean -eX -u doctags.vim >/dev/null && \
+	      echo "help tags updated"; \
 	  else echo "vim executable $(VIMEXE) not found; help tags not updated"; fi
 
 # Use "doctags" to generate the tags file.  Only works for English!
diff --git a/src/version.c b/src/version.c
index 9b4c386a4..2a09818a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2253,
 /**/
     2252,
 /**/