Skip to content
Commit 5f5e497f authored by Robert Martin-Legene's avatar Robert Martin-Legene
Browse files

Not including recommends

parent d1956cab
No related branches found
No related tags found
No related merge requests found
...@@ -50,7 +50,6 @@ function yesno ...@@ -50,7 +50,6 @@ function yesno
function nodejs_pre function nodejs_pre
{ {
info nodejs info nodejs
pkgs="$pkgs nodejs"
# Nodejs software repository PGP key # Nodejs software repository PGP key
if [ `apt-key export ${NODEJSPGP} 2>&1 | wc -l` -le 50 ] if [ `apt-key export ${NODEJSPGP} 2>&1 | wc -l` -le 50 ]
then then
...@@ -65,6 +64,7 @@ function nodejs_pre ...@@ -65,6 +64,7 @@ function nodejs_pre
info And now updating the software package list. info And now updating the software package list.
apt update apt update
fi fi
aptinstall nodejs npm
} }
function nodejs_post function nodejs_post
...@@ -154,14 +154,12 @@ function geth_post ...@@ -154,14 +154,12 @@ function geth_post
function aptinstall function aptinstall
{ {
local inst= for pkg in $*
for pkg in $pkgs
do do
# consider apt install --install-suggests if you are masochist
dpkg --verify $pkg 2>/dev/null || dpkg --verify $pkg 2>/dev/null ||
inst="$inst $pkg" info Installing $pkg &&
done apt -y install $pkg
test -n "$inst" &&
apt --install-suggests -y install $inst || true
} }
function usersetup function usersetup
...@@ -215,9 +213,8 @@ function welcome ...@@ -215,9 +213,8 @@ function welcome
# development tools # development tools
pkgs="$pkgs curl build-essential git" aptinstall dirmngr apt-transport-https curl git curl build-essential
nodejs_pre nodejs_pre
aptinstall
usersetup usersetup
nodejs_post nodejs_post
golang_pre golang_pre
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment