Skip to content
Snippets Groups Projects
Commit b6451cfa authored by Bob Mottram's avatar Bob Mottram
Browse files

Tidying

parent 0d2226b1
No related branches found
No related tags found
No related merge requests found
......@@ -193,7 +193,7 @@ function nodejs_install_n {
fi
# update from the old debian nodejs version
echo $"Installing n ${NODEJS_N_VERSION} on ${NPM_ARCH}"
$mesh_install_nodejs_prefix npm install -g n@${NODEJS_N_VERSION} --save
npm install -g n@${NODEJS_N_VERSION} --save
}
function nodejs_install_from_n {
......@@ -205,7 +205,7 @@ function nodejs_install_from_n {
fi
echo $"Installing nodejs ${NODEJS_VERSION} via n"
$mesh_install_nodejs_prefix n ${NODEJS_VERSION}
n ${NODEJS_VERSION}
nodejs_fix_cpu_detection
cp "$rootdir/root/npm" "$rootdir/usr/bin/npm"
cp "$rootdir/root/npm" "$rootdir/usr/local/bin/npm"
......@@ -234,7 +234,7 @@ if [[ "\$npm_version" != "${NPM_VERSION}" ]]; then
fi
EOF
chmod +x "$rootdir/usr/bin/test_nodejs_install"
if ! $mesh_install_nodejs_prefix /usr/bin/test_nodejs_install; then
if ! /usr/bin/test_nodejs_install; then
echo $"nodejs version numbers did not match. Architecture is $NPM_ARCH."
NODE_UPGRADE=
exit 76
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment