Replace grep with bash's regex operator

bazel-contrib · Jan 30, 2020 · 9fb080b · 9fb080b
1 parent 8854bfd
commit 9fb080b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/internal/node/node_patches.js b/internal/node/node_patches.js
@@ -563,10 +563,9 @@ set Path=${nodeDir};%Path%
         }
         else {
             fs$1.writeFileSync(path.join(nodeDir, 'node'), `#!/bin/bash
-export NP_PATCHED_NODEJS=${nodeDir}
-export PATH=${nodeDir}:$PATH
-hasScript=\`echo "$@" | grep ${path.basename(requireScriptName)}\`
-if [ "$hasScript"=="" ]; then
+export NP_PATCHED_NODEJS="${nodeDir}"
+export PATH="${nodeDir}":\$PATH
+if [[ ! "\${@}" =~ "${file}" ]]; then
   exec ${process.execPath} --require "${requireScriptName}" "$@"
 else
   exec ${process.execPath} "$@"

diff --git a/packages/node-patches/src/subprocess.ts b/packages/node-patches/src/subprocess.ts
@@ -28,10 +28,9 @@ set Path=${nodeDir};%Path%
     } else {
       fs.writeFileSync(
           path.join(nodeDir, 'node'), `#!/bin/bash
-export NP_PATCHED_NODEJS=${nodeDir}
-export PATH=${nodeDir}:$PATH
-hasScript=\`echo "$@" | grep ${path.basename(requireScriptName)}\`
-if [ "$hasScript"=="" ]; then
+export NP_PATCHED_NODEJS="${nodeDir}"
+export PATH="${nodeDir}":\$PATH
+if [[ ! "\${@}" =~ "${file}" ]]; then
   exec ${process.execPath} --require "${requireScriptName}" "$@"
 else
   exec ${process.execPath} "$@"