From f7e97ce74718496efab7bc3b58d49d19b4427e2a Mon Sep 17 00:00:00 2001
From: Myles Borins <mylesborins@github.com>
Date: Mon, 5 Oct 2020 17:15:01 -0400
Subject: [PATCH 1/2] Revert "Remove unused npx binary"

This reverts commit f019a248a67e8c46dbe41bf31f4818c5ca2138bf.

Git Bash on Windows still uses this file. Removing it broke
the windows MSI builds in Node.js infrastructure. Unless we
absolutely need to remove this I think it is worth keeping
around
---
 bin/npx | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 bin/npx

diff --git a/bin/npx b/bin/npx
new file mode 100644
index 0000000000000..261e339850da5
--- /dev/null
+++ b/bin/npx
@@ -0,0 +1,35 @@
+#!/bin/sh
+(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
+
+basedir=`dirname "$0"`
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+NODE_EXE="$basedir/node.exe"
+if ! [ -x "$NODE_EXE" ]; then
+  NODE_EXE=node
+fi
+
+NPM_CLI_JS="$basedir/node_modules/npm/bin/npm-cli.js"
+NPX_CLI_JS="$basedir/node_modules/npm/bin/npx-cli.js"
+
+case `uname` in
+  *MINGW*)
+    NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
+    NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
+    if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
+      NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
+    fi
+    ;;
+  *CYGWIN*)
+    NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
+    NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
+    if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
+      NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
+    fi
+    ;;
+esac
+
+"$NODE_EXE" "$NPX_CLI_JS" "$@"

From f33980ef4b1311fdd3981333e818ba44b80c9aba Mon Sep 17 00:00:00 2001
From: Ruy Adorno <ruyadorno@hotmail.com>
Date: Thu, 10 Sep 2020 23:34:04 -0400
Subject: [PATCH 2/2] fix: npx bin should be executable

---
 bin/npx | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/npx

diff --git a/bin/npx b/bin/npx
old mode 100644
new mode 100755