refactor(node): remove redundant echo

[webi-installers/.git] / node / install.sh

diff --git a/node/install.sh b/node/install.sh
index f2c259c801152e02d988e79cfea9f26ae6cbed8a..b0f822a38ab988abaea34d6a6e2c4a7f311b61e2 100644 (file)
--- a/node/install.sh
+++ b/node/install.sh
@@ -1,16 +1,26 @@
 #!/bin/bash
 
+# "This is too simple" you say! "Where is the magic!?" you ask.
+# There is no magic!
+# The custom functions for node are here.
+# The generic functions - version checks, download, extract, etc - are here:
+#   - https://github.com/webinstall/packages/branches/master/_webi/template.sh
+
 set -e
 set -u
 
 pkg_cmd_name="node"
+#WEBI_SINGLE=""
 
 pkg_get_current_version() {
     # 'node --version' has output in this format:
     #       v12.8.0
     # This trims it down to just the version number:
     #       12.8.0
-    echo "$(node --version 2>/dev/null | head -n 1 | cut -d' ' -f1 | sed 's:^v::')"
+    node --version 2> /dev/null |
+        head -n 1 |
+        cut -d' ' -f1 |
+        sed 's:^v::'
 }
 
 pkg_install() {
@@ -27,6 +37,9 @@ pkg_link() {
 
     # ln -s "$HOME/.local/opt/node-v14.4.0" "$HOME/.local/opt/node"
     ln -s "$pkg_src" "$pkg_dst"
+
+    # Node bugfix: use the correct version of node, even if PATH has a conflict
+    "$pkg_src"/bin/node "$pkg_src"/bin/npm config set scripts-prepend-node-path=true
 }
 
 pkg_done_message() {