浏览代码

Handle image install of global node modules directory

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

+ 11
- 9
src/freedombone-utils-nodejs 查看文件

@@ -204,18 +204,20 @@ function nodejs_upgrade {
204 204
 }
205 205
 
206 206
 function nodejs_setup_global_modules {
207
-    if [ ! -d /root/.npm-global ]; then
208
-        mkdir /root/.npm-global
207
+    if [ ! -d "$rootdir/root/.npm-global" ]; then
208
+        mkdir "$rootdir/root/.npm-global"
209 209
     fi
210
-    npm config set prefix '/root/.npm-global'
211
-    export PATH=/root/.npm-global/bin:$PATH
212
-    if ! grep -q "PATH=/root/.npm-global/bin" /root/.bashrc; then
213
-        echo "PATH=/root/.npm-global/bin:\$PATH" >> /root/.bashrc
210
+    $mesh_install_nodejs_prefix npm config set prefix '/root/.npm-global'
211
+    if ! grep -q "PATH=/root/.npm-global/bin" "$rootdir/root/.bashrc"; then
212
+        echo "PATH=/root/.npm-global/bin:\$PATH" >> "$rootdir/root/.bashrc"
214 213
     fi
215
-    if ! grep -q "NPM_CONFIG_PREFIX=" /root/.bashrc; then
216
-        echo "export NPM_CONFIG_PREFIX=/root/.npm-global" >> /root/.bashrc
214
+    if ! grep -q "NPM_CONFIG_PREFIX=" "$rootdir/root/.bashrc"; then
215
+        echo "export NPM_CONFIG_PREFIX=/root/.npm-global" >> "$rootdir/root/.bashrc"
216
+    fi
217
+    if [ ! "$rootdir" ]; then
218
+        export PATH=/root/.npm-global/bin:$PATH
219
+        export NPM_CONFIG_PREFIX=/root/.npm-global
217 220
     fi
218
-    export NPM_CONFIG_PREFIX=/root/.npm-global
219 221
 }
220 222
 
221 223
 function remove_nodejs {