From 8e5b94d176fff70750201265a66fb2a9750e835a Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Wed, 23 Oct 2019 17:11:19 -0600 Subject: [PATCH] install packages before we do anything else --- boxctl.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/boxctl.sh b/boxctl.sh index b30a7d9..d5954cf 100755 --- a/boxctl.sh +++ b/boxctl.sh @@ -210,6 +210,13 @@ _ssh() { V=$(expand_v) +if [ -f ./packages ]; then + msg 0 "installing $(wc -l packages | awk '{print $1 " " $2}')" + cmd=$(printf "${PKG_DIFF_INSTALL}" $V $V) + _scp packages "${RUN_USER}@${SERVER}:/etc/packages.tmp" + _ssh ${RUN_USER}@${SERVER} "${cmd}" +fi + if [ -f ./groups ]; then msg 0 "adding $(wc -l groups | awk '{print $1 " " $2}')" for group in $(cat groups); do @@ -279,13 +286,6 @@ EOF done fi -if [ -f ./packages ]; then - msg 0 "installing $(wc -l packages | awk '{print $1 " " $2}')" - cmd=$(printf "${PKG_DIFF_INSTALL}" $V $V) - _scp packages "${RUN_USER}@${SERVER}:/etc/packages.tmp" - _ssh ${RUN_USER}@${SERVER} "${cmd}" -fi - if [ $MAINTENANCE == 1 ]; then msg 0 "cleaning up unused packages" _ssh ${RUN_USER}@${SERVER} "/usr/sbin/pkg_delete $V -a"