From 5f5e497f6bc9baf716cfeb8f62c7f8b870a6cfc9 Mon Sep 17 00:00:00 2001
From: Robert Martin-Legene <robert@nic.ar>
Date: Wed, 26 Sep 2018 12:40:07 -0300
Subject: [PATCH] Not including recommends
---
bin/installbfa.sh | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/bin/installbfa.sh b/bin/installbfa.sh
index 2ab7a09..8a59158 100755
--- a/bin/installbfa.sh
+++ b/bin/installbfa.sh
@@ -50,7 +50,6 @@ function yesno
function nodejs_pre
{
info nodejs
- pkgs="$pkgs nodejs"
# Nodejs software repository PGP key
if [ `apt-key export ${NODEJSPGP} 2>&1 | wc -l` -le 50 ]
then
@@ -65,6 +64,7 @@ function nodejs_pre
info And now updating the software package list.
apt update
fi
+ aptinstall nodejs npm
}
function nodejs_post
@@ -154,14 +154,12 @@ function geth_post
function aptinstall
{
- local inst=
- for pkg in $pkgs
+ for pkg in $*
do
+ # consider apt install --install-suggests if you are masochist
dpkg --verify $pkg 2>/dev/null ||
- inst="$inst $pkg"
- done
- test -n "$inst" &&
- apt --install-suggests -y install $inst || true
+ info Installing $pkg &&
+ apt -y install $pkg
}
function usersetup
@@ -215,9 +213,8 @@ function welcome
# development tools
-pkgs="$pkgs curl build-essential git"
+aptinstall dirmngr apt-transport-https curl git curl build-essential
nodejs_pre
-aptinstall
usersetup
nodejs_post
golang_pre
--
GitLab