X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=f31d46e14dc4e1c1ce0f85443bc3efd170184dc4;hb=b90cbe6fb320eb412fd897bf86f0a2ab449f2a9f;hp=d811382907144756a025a68df8126cda67b25be0;hpb=adcf95ed24eb565e97c003f5041acdf766c72471;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index d8113829..f31d46e1 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -143,10 +143,12 @@ function check_packages() { NEEDED_PACKAGES="$1" echo -e "Checking required packages: ${NEEDED_PACKAGES}" for PACKAGE in ${NEEDED_PACKAGES} ; do - dpkg -L ${PACKAGE} &>/dev/null + dpkg -L ${PACKAGE} if [ $? -ne 0 ]; then - echo -e "Package ${PACKAGE} is not installed. Updating apt" + echo -e "Package ${PACKAGE} is not installed." + echo -e "Updating apt-cache ..." sudo apt-get update + echo -e "Installing ${PACKAGE} ..." sudo apt-get install -y ${PACKAGE} || FATAL "failed to install ${PACKAGE}" fi done @@ -659,7 +661,6 @@ function install_osm() { # if no host is passed in, we need to install lxd/juju, unless explicilty asked not to if [ -z "$OSM_VCA_HOST" ] && [ -z "$INSTALL_NOLXD" ] && [ -z "$LXD_CLOUD_FILE" ]; then - check_packages "snapd" install_lxd fi @@ -875,7 +876,7 @@ function ctrl_c() { LXD_VERSION=4.0 JUJU_VERSION=2.9 -JUJU_AGENT_VERSION=2.9.17 +JUJU_AGENT_VERSION=2.9.22 UNINSTALL="" DEVELOP="" UPDATE="" @@ -1154,7 +1155,7 @@ fi # if develop, we force master [ -z "$COMMIT_ID" ] && [ -n "$DEVELOP" ] && COMMIT_ID="master" -check_packages "git wget curl tar" +check_packages "git wget curl tar snapd" sudo snap install jq if [ -z "$OSM_DEVOPS" ]; then