|
@@ -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
|