浏览代码

Set n architecture

Bob Mottram 7 年前
父节点
当前提交
388f3d6168
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5
    1
      src/freedombone-utils-nodejs

+ 5
- 1
src/freedombone-utils-nodejs 查看文件

44
 NODEJS_INSTALLED_APPS_FILE=$HOME/.nodejs-apps
44
 NODEJS_INSTALLED_APPS_FILE=$HOME/.nodejs-apps
45
 
45
 
46
 function get_npm_arch {
46
 function get_npm_arch {
47
+    N_ARCH='x86'
47
     NPM_ARCH='ia32'
48
     NPM_ARCH='ia32'
48
     if [[ $ARCHITECTURE == 'arm'* ]]; then
49
     if [[ $ARCHITECTURE == 'arm'* ]]; then
49
         NPM_ARCH='armv7l'
50
         NPM_ARCH='armv7l'
51
+        N_ARCH='arm'
50
     fi
52
     fi
51
     if [[ $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'amd64' ]]; then
53
     if [[ $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'amd64' ]]; then
52
         NPM_ARCH='x64'
54
         NPM_ARCH='x64'
55
+        N_ARCH='x64'
53
     fi
56
     fi
54
 }
57
 }
55
 
58
 
90
 
93
 
91
     # update from the old debian nodejs version
94
     # update from the old debian nodejs version
92
     get_npm_arch
95
     get_npm_arch
93
-    chroot "$rootdir" npm install --arch=$NPM_ARCH node@$NODEJS_VERSION -g
96
+    chroot "$rootdir" npm install --arch=$NPM_ARCH -g n@${NODEJS_N_VERSION} --save
97
+    chroot "$rootdir" n --arch $N_ARCH ${NODEJS_VERSION}
94
 }
98
 }
95
 
99
 
96
 function remove_nodejs {
100
 function remove_nodejs {