From a5407e1c7df0a2a7bc5e2ecca889a6ce50b53a70 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 28 Jul 2018 19:50:53 -0400
Subject: [PATCH] scripts: Replace node-wrapper with a symlink.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit 00e057bf4414cd631d917ac1b4581dd7f0373fcd (#4727) simplified
node-wrapper to a one-line wrapper script for performance.  Copying
the binary was proposed and rejected because node finds some of its
modules relative to its own path.  But a symlink doesn’t have that
issue, as you can verify with

    node -e 'console.log(require.resolve.paths("foo"))'

(To find its own path, node uses `process.execPath`, which resolves
symlinks, and there’s no plausible reason for that behavior to change.
https://github.com/nodejs/node/blob/v8.11.1/lib/module.js#L708-L717
https://github.com/nodejs/node/blob/v10.7.0/lib/internal/modules/cjs/loader.js#L761-L770)

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 scripts/lib/install-node   | 11 +++++------
 scripts/setup/node-wrapper |  2 --
 2 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100755 scripts/setup/node-wrapper

diff --git a/scripts/lib/install-node b/scripts/lib/install-node
index 6e471fd958..18a51e52d6 100755
--- a/scripts/lib/install-node
+++ b/scripts/lib/install-node
@@ -16,16 +16,16 @@ yarn_version=1.7.0
 export HOME=/root
 
 current_node_version="none"
-if hash node 2>/dev/null; then
+if node_wrapper_path="$(type -p node)"; then
     current_node_version="$(node --version)"
 fi
 
-if [ "$($YARN_BIN --version 2>/dev/null)" = "$yarn_version" ] && [ "$current_node_version" = "v$node_version" ]; then
+if [ "$($YARN_BIN --version 2>/dev/null)" = "$yarn_version" ] && [ "$current_node_version" = "v$node_version" ] && [ -L "$node_wrapper_path" ]; then
     echo "Node version $node_version and yarn version $yarn_version are already installed."
     exit 0
 fi
 
-if [ "$current_node_version" != "v$node_version" ]; then
+if [ "$current_node_version" != "v$node_version" ] || ! [ -L "$node_wrapper_path" ]; then
     export NVM_DIR=/usr/local/nvm
     if ! [ -e "$NVM_DIR/nvm.sh" ]; then
         wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash
@@ -41,9 +41,8 @@ if [ "$current_node_version" != "v$node_version" ]; then
     chown -R root:root "$n"
     chmod -R go-w "$n"
 
-    # Install node wrapper to /usr/local/bin
-    cp "$ZULIP_PATH/scripts/setup/node-wrapper" /usr/local/bin/node
-    sed -i "s|NODE_PATH|$NODE_BIN|" /usr/local/bin/node
+    # Install node symlink to /usr/local/bin
+    ln -nsf "$NODE_BIN" /usr/local/bin/node
 fi
 
 # Work around the fact that apparently sudo doesn't clear the HOME
diff --git a/scripts/setup/node-wrapper b/scripts/setup/node-wrapper
deleted file mode 100755
index bbf3e60ecb..0000000000
--- a/scripts/setup/node-wrapper
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-NODE_PATH "$@"