From c07c734f451332a1ef18b6667b758f62d28d3e49 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Mon, 19 Oct 2015 17:41:03 -0700
Subject: [PATCH] Changed to a more portable Node version check in binding.gyp
---
binding.gyp | 7 ++++---
templates/binding.gyp.template | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/binding.gyp b/binding.gyp
index 3a3a88187e..de10d9d900 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -46,10 +46,11 @@
# io.js always reports versions >0 and always exports ALPN symbols.
# Therefore, Node's major version will be truthy if and only if it
# supports ALPN. The output of "node -v" is v[major].[minor].[patch],
- # like "v4.1.1" in a recent version. We use grep to extract just the
- # major version. "4", would be the output for the example.
+ # like "v4.1.1" in a recent version. We use cut to split by period and
+ # take the first field (resulting in "v[major]"), then use cut again
+ # to take all but the first character, removing the "v".
'defines': [
- 'TSI_OPENSSL_ALPN_SUPPORT=<!(node -v | grep -oP "(?<=v)(\d+)(?=\.\d+\.\d+)")'
+ 'TSI_OPENSSL_ALPN_SUPPORT=<!(node --version | cut -d. -f1 | cut -c2-)'
],
'include_dirs': [
'.',
diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template
index bfa6a56bf6..e86449fd3f 100644
--- a/templates/binding.gyp.template
+++ b/templates/binding.gyp.template
@@ -48,10 +48,11 @@
# io.js always reports versions >0 and always exports ALPN symbols.
# Therefore, Node's major version will be truthy if and only if it
# supports ALPN. The output of "node -v" is v[major].[minor].[patch],
- # like "v4.1.1" in a recent version. We use grep to extract just the
- # major version. "4", would be the output for the example.
+ # like "v4.1.1" in a recent version. We use cut to split by period and
+ # take the first field (resulting in "v[major]"), then use cut again
+ # to take all but the first character, removing the "v".
'defines': [
- 'TSI_OPENSSL_ALPN_SUPPORT=<!(node -v | grep -oP "(?<=v)(\d+)(?=\.\d+\.\d+)")'
+ 'TSI_OPENSSL_ALPN_SUPPORT=<!(node --version | cut -d. -f1 | cut -c2-)'
],
'include_dirs': [
'.',
--
GitLab