Browse Source

exports before scuttlebot install

Bob Mottram 7 years ago
parent
commit
561fd38b7a
2 changed files with 22 additions and 18 deletions
  1. 3
    18
      src/freedombone-app-scuttlebot
  2. 19
    0
      src/freedombone-utils-nodejs

+ 3
- 18
src/freedombone-app-scuttlebot View File

@@ -357,24 +357,6 @@ function scuttlebot_git_setup {
357 357
     fi
358 358
 }
359 359
 
360
-function mesh_setup_npm {
361
-    cat <<EOF > "$rootdir/usr/bin/install_npm_global"
362
-#!/bin/bash
363
-if [ ! -d ~/.npm-global ]; then
364
-    mkdir ~/.npm-global
365
-fi
366
-npm config set prefix '~/.npm-global'
367
-if [[ "$PATH" != *'~/.npm-global/bin'* ]]; then
368
-    export PATH=~/.npm-global/bin:$PATH
369
-    echo 'export PATH=~/.npm-global/bin:$PATH' >> ~/.bashrc
370
-fi
371
-source ~/.profile
372
-EOF
373
-    chroot "$rootdir" /bin/chmod +x /usr/bin/install_npm_global
374
-    chroot "$rootdir" /usr/bin/install_npm_global
375
-    rm "$rootdir/usr/bin/install_npm_global"
376
-}
377
-
378 360
 function mesh_install_dat {
379 361
     get_npm_arch
380 362
     mesh_setup_npm
@@ -402,6 +384,9 @@ function mesh_install_scuttlebot {
402 384
 
403 385
     cat <<EOF > "$rootdir/usr/bin/install_scuttlebot"
404 386
 #!/bin/bash
387
+export PATH=~/.npm-global/bin:$PATH
388
+export NPM_CONFIG_PREFIX=~/.npm-global
389
+source ~/.profile
405 390
 if ! npm install --unsafe-perm --verbose --arch=$NPM_ARCH -g scuttlebot@${SCUTTLEBOT_VERSION}; then
406 391
     exit 1
407 392
 fi

+ 19
- 0
src/freedombone-utils-nodejs View File

@@ -244,6 +244,25 @@ function nodejs_upgrade {
244 244
     npm update -g
245 245
 }
246 246
 
247
+function mesh_setup_npm {
248
+    cat <<EOF > "$rootdir/usr/bin/install_npm_global"
249
+#!/bin/bash
250
+if [ ! -d ~/.npm-global ]; then
251
+    mkdir ~/.npm-global
252
+fi
253
+npm config set prefix '~/.npm-global'
254
+if [[ "$PATH" != *'~/.npm-global/bin'* ]]; then
255
+    export PATH=~/.npm-global/bin:$PATH
256
+    echo 'export PATH=~/.npm-global/bin:$PATH' >> ~/.bashrc
257
+fi
258
+export NPM_CONFIG_PREFIX=~/.npm-global
259
+source ~/.profile
260
+EOF
261
+    chroot "$rootdir" /bin/chmod +x /usr/bin/install_npm_global
262
+    chroot "$rootdir" /usr/bin/install_npm_global
263
+    rm "$rootdir/usr/bin/install_npm_global"
264
+}
265
+
247 266
 function nodejs_setup_global_modules {
248 267
     if [ ! -f /usr/local/bin/node ]; then
249 268
         return