free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change nodejs installation within image

This commit is contained in:
Bob Mottram 2017-06-15 21:55:42 +01:00
parent 7c029463c4
commit eaa53b3bed
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/freedombone-image-customise
View File

@ -1218,16 +1218,8 @@ function image_setup_utils {
} }
function image_install_nodejs { function image_install_nodejs {
if [ $INSTALLING_MESH ]; then mesh_install_nodejs
return echo 'install_nodejs' >> ${rootdir}/root/${PROJECT_NAME}-completed.txt
fi
chroot "$rootdir" apt-get -yq install nodejs curl
if [ ! -f $rootdir/usr/bin/nodejs ]; then
echo $'nodejs was not installed'
exit 63962
fi
} }
function image_preinstall_repos { function image_preinstall_repos {

15
src/freedombone-utils-nodejs
View File

@ -45,11 +45,8 @@ NODEJS_INSTALLED_APPS_FILE=$HOME/.nodejs-apps
function mesh_install_nodejs { function mesh_install_nodejs {
# Note: this has to be jessie for now # Note: this has to be jessie for now
if [ ! -d ${rootdir}/$INSTALL_DIR ]; then wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key > ${rootdir}/root/node.gpg.key
mkdir ${rootdir}/$INSTALL_DIR chroot "${rootdir}" apt-key add /root/node.gpg.key
fi
chroot "${rootdir}" wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key > $INSTALL_DIR/node.gpg.key
chroot "${rootdir}" apt-key add $INSTALL_DIR/node.gpg.key
echo "deb https://deb.nodesource.com/node_7.x jessie main" > ${rootdir}/etc/apt/sources.list.d/nodesource.list echo "deb https://deb.nodesource.com/node_7.x jessie main" > ${rootdir}/etc/apt/sources.list.d/nodesource.list
echo "deb-src https://deb.nodesource.com/node_7.x jessie main" >> ${rootdir}/etc/apt/sources.list.d/nodesource.list echo "deb-src https://deb.nodesource.com/node_7.x jessie main" >> ${rootdir}/etc/apt/sources.list.d/nodesource.list
chroot "${rootdir}" apt-get update chroot "${rootdir}" apt-get update
@ -151,12 +148,8 @@ function install_nodejs {
fi fi
# Note: this has to be jessie for now # Note: this has to be jessie for now
if [ ! -d $INSTALL_DIR ]; then wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key > /root/node.gpg.key
mkdir $INSTALL_DIR apt-key add /root/node.gpg.key
fi
cd $INSTALL_DIR
wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key > $INSTALL_DIR/node.gpg.key
apt-key add $INSTALL_DIR/node.gpg.key
echo "deb https://deb.nodesource.com/node_7.x jessie main" > /etc/apt/sources.list.d/nodesource.list echo "deb https://deb.nodesource.com/node_7.x jessie main" > /etc/apt/sources.list.d/nodesource.list
echo "deb-src https://deb.nodesource.com/node_7.x jessie main" >> /etc/apt/sources.list.d/nodesource.list echo "deb-src https://deb.nodesource.com/node_7.x jessie main" >> /etc/apt/sources.list.d/nodesource.list