diff --git a/Makefile b/Makefile index c311bbee1..5d33e5d05 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,9 @@ YARN:=yarn-not-found # if they fail, they stop the make process. As best I can tell there's no # way to get make to fail if a sub-shell command fails. .node-bin: etc/scripts/find-node - @etc/scripts/find-node > .node-bin + @etc/scripts/find-node .node-bin .yarn-bin: etc/scripts/find-yarn node-installed - @etc/scripts/find-yarn > .yarn-bin + @etc/scripts/find-yarn .yarn-bin # All targets that need node must depend on this to ensure the NODE variable # is appropriately set, and that PATH is updated so that yarn etc will use this diff --git a/etc/scripts/find-node b/etc/scripts/find-node index 8be05d64b..51e6c8089 100755 --- a/etc/scripts/find-node +++ b/etc/scripts/find-node @@ -1,6 +1,7 @@ #!/bin/bash set -e +OUT="$1" find_node() { local NODE="${NODE_DIR}/bin/node" @@ -39,4 +40,4 @@ if [[ ${NODE_MAJOR_VERSION} -gt ${NODE_VERSION_USED} ]]; then >&2 echo The higher node version might work but it has not been tested. fi -echo ${NODE} \ No newline at end of file +echo ${NODE} > ${OUT} diff --git a/etc/scripts/find-yarn b/etc/scripts/find-yarn index f524b984f..fc98b1d8c 100755 --- a/etc/scripts/find-yarn +++ b/etc/scripts/find-yarn @@ -1,6 +1,7 @@ #!/bin/bash set -e +OUT="$1" YARN=$(pwd)/node_modules/.bin/yarn @@ -10,4 +11,4 @@ if [[ ! -x "${YARN}" ]]; then >&2 npm install yarn fi -echo ${YARN} \ No newline at end of file +echo ${YARN} > ${OUT}