free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Condition to avoid cpu detection bug

This commit is contained in:
Bob Mottram 2018-04-03 18:06:58 +01:00
parent e02c86ddd3
commit 3c1e4e4e9f
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/freedombone-utils-nodejs
View File

@ -175,17 +175,22 @@ function mesh_install_nodejs {
# update from the old debian nodejs version
$mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g n@${NODEJS_N_VERSION} --save
#$mesh_install_nodejs_prefix n --arch $N_ARCH ${NODEJS_VERSION}
#nodejs_fix_cpu_detection
#cp "$rootdir/root/npm" "$rootdir/usr/bin/npm"
#cp "$rootdir/root/npm" "$rootdir/usr/local/bin/npm"
if [ ! "$rootdir" ]; then
# Don't do this if we're building an image,
# because cpu detection faults occur.
# This condition may no longer be needed in future once the bug is fixed
$mesh_install_nodejs_prefix n --arch $N_ARCH ${NODEJS_VERSION}
nodejs_fix_cpu_detection
cp "$rootdir/root/npm" "$rootdir/usr/bin/npm"
cp "$rootdir/root/npm" "$rootdir/usr/local/bin/npm"
# deliberate second install of npm
#$mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g npm@${NPM_VERSION} --save
#if [ -f "$rootdir/usr/local/bin/npm" ]; then
# cp "$rootdir/usr/local/bin/npm" "$rootdir/usr/bin/npm"
#fi
#cp "$rootdir/usr/bin/npm" "$rootdir/root/npm"
$mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g npm@${NPM_VERSION} --save
if [ -f "$rootdir/usr/local/bin/npm" ]; then
cp "$rootdir/usr/local/bin/npm" "$rootdir/usr/bin/npm"
fi
cp "$rootdir/usr/bin/npm" "$rootdir/root/npm"
fi
if [ -f "$rootdir/usr/bin/node" ]; then
cp "$rootdir/usr/bin/node" "$rootdir/usr/local/bin/node"
fi