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

Don't install n within images

parent 7c27b35c
No related branches found
No related tags found
No related merge requests found
......@@ -176,7 +176,7 @@ function nodejs_install_npm_secondary {
# deliberate second install of npm
echo $"Installing npm ${NPM_VERSION}"
$mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g npm@${NPM_VERSION} --save
$mesh_install_nodejs_prefix npm install -g npm@${NPM_VERSION} --save
if [ -f "$rootdir/root/.npm-global/lib/node_modules/npm/bin/npm" ]; then
cp "$rootdir/root/.npm-global/lib/node_modules/npm/bin/npm" "$rootdir/usr/local/bin/npm"
cp "$rootdir/root/.npm-global/lib/node_modules/npm/bin/npm" "$rootdir/usr/bin/npm"
......@@ -188,9 +188,12 @@ function nodejs_install_npm_secondary {
}
function nodejs_install_n {
if [ "$rootdir" ]; then
return
fi
# update from the old debian nodejs version
echo $"Installing n ${NODEJS_N_VERSION} on ${NPM_ARCH}"
$mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g n@${NODEJS_N_VERSION} --save
$mesh_install_nodejs_prefix npm install -g n@${NODEJS_N_VERSION} --save
}
function nodejs_install_from_n {
......@@ -202,7 +205,7 @@ function nodejs_install_from_n {
fi
echo $"Installing nodejs ${NODEJS_VERSION} via n"
$mesh_install_nodejs_prefix n --arch $N_ARCH ${NODEJS_VERSION}
$mesh_install_nodejs_prefix n ${NODEJS_VERSION}
nodejs_fix_cpu_detection
cp "$rootdir/root/npm" "$rootdir/usr/bin/npm"
cp "$rootdir/root/npm" "$rootdir/usr/local/bin/npm"
......
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