From 388f3d61688b98e54ea7d517073f1aaa480a8c44 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 14 Sep 2017 13:34:22 +0100
Subject: [PATCH] Set n architecture
---
src/freedombone-utils-nodejs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index ed680ed6b..9f0290a86 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -44,12 +44,15 @@ NPM_VERSION='4.0.5'
NODEJS_INSTALLED_APPS_FILE=$HOME/.nodejs-apps
function get_npm_arch {
+ N_ARCH='x86'
NPM_ARCH='ia32'
if [[ $ARCHITECTURE == 'arm'* ]]; then
NPM_ARCH='armv7l'
+ N_ARCH='arm'
fi
if [[ $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'amd64' ]]; then
NPM_ARCH='x64'
+ N_ARCH='x64'
fi
}
@@ -90,7 +93,8 @@ function mesh_install_nodejs {
# update from the old debian nodejs version
get_npm_arch
- chroot "$rootdir" npm install --arch=$NPM_ARCH node@$NODEJS_VERSION -g
+ chroot "$rootdir" npm install --arch=$NPM_ARCH -g n@${NODEJS_N_VERSION} --save
+ chroot "$rootdir" n --arch $N_ARCH ${NODEJS_VERSION}
}
function remove_nodejs {
--
GitLab