[Git][NTPsec/ntpsec][master] Merge latest upstream autorevision

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
2dbf27fb by Matt Selsky at 2016-12-27T13:13:43-05:00
Merge latest upstream autorevision

Fixes building on OpenBSD 6.0, where ksh has a default alias from 'local' to 'typeset'

- - - - -


1 changed file:

- wafhelpers/autorevision.sh


Changes:

=====================================
wafhelpers/autorevision.sh
=====================================
--- a/wafhelpers/autorevision.sh
+++ b/wafhelpers/autorevision.sh
@@ -69,7 +69,7 @@ EOF
 }
 
 # Config
-ARVERSION="1.18"
+ARVERSION="1.19"
 while getopts ":t:o:s:e:VfU" OPTION; do
 	case "${OPTION}" in
 		t)
@@ -117,9 +117,10 @@ elif [ ! -f "${CACHEFILE}" ] && [ "${CACHEFORCE}" = "1" ]; then
 	exit 1
 fi
 
-# Only use the local keyword if it is there (Solaris we are looking at
+# Only use the local keyword if it is there (ksh we are looking at
 # you).
-if command -v local > /dev/null 2>&1; then
+
+if [ "$(command -v local 2> /dev/null)" = "local" ]; then
 	LOCAL="local"
 elif command -v typeset > /dev/null 2>&1; then
 	LOCAL="typeset"



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/2dbf27fb1008e1d3ae77fa5e8eb61d6ed7908566
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20161227/0e4566d0/attachment.html>