From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 10 Feb 2022 00:43:59 +0000 (+0100)
Subject: Minor updates in install_osm.sh to avoid warnings
X-Git-Tag: v12.0.0rc1~41
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=5f420b192c928cf29c5af8bbad75c82dd4937b99

Minor updates in install_osm.sh to avoid warnings

Change-Id: Id91f022f9e368315f9bd67f8d1eeea9028d17f2d
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 10e618f9..532f97d8 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -93,7 +93,7 @@ add_repo() {
     echo -e "Checking required packages to add ETSI OSM debian repo: $need_packages_lw"
     dpkg -l $need_packages_lw &>/dev/null \
       || ! echo -e "One or several required packages are not installed. Updating apt cache requires root privileges." \
-      || sudo apt-get -q update \
+      || sudo apt-get -qy update \
       || ! echo "failed to run apt-get update" \
       || exit 1
     dpkg -l $need_packages_lw &>/dev/null \
@@ -101,9 +101,9 @@ add_repo() {
       || sudo apt-get install -y $need_packages_lw \
       || ! echo "failed to install $need_packages_lw" \
       || exit 1
-    wget -qO - $REPOSITORY_BASE/$RELEASE/OSM%20ETSI%20Release%20Key.gpg | sudo apt-key add -
-    sudo DEBIAN_FRONTEND=noninteractive add-apt-repository -y "$1" \
-    && sudo APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 DEBIAN_FRONTEND=noninteractive apt-get update
+    wget -qO - "$REPOSITORY_BASE/$RELEASE/OSM%20ETSI%20Release%20Key.gpg" | sudo APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE apt-key add -
+    sudo DEBIAN_FRONTEND=noninteractive add-apt-repository -y "$1"
+    sudo APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 DEBIAN_FRONTEND=noninteractive apt-get -y update
     return 0
   fi
 
@@ -130,7 +130,7 @@ EOF"
     else
         sudo sed -i "s|Proxy.*|Proxy \"${OSM_APT_PROXY}\"; }|" ${OSM_APT_PROXY_FILE}
     fi
-    sudo apt-get update || FATAL "Configured apt proxy, but couldn't run 'apt-get update'. Check ${OSM_APT_PROXY_FILE}"
+    sudo apt-get -y update || FATAL "Configured apt proxy, but couldn't run 'apt-get update'. Check ${OSM_APT_PROXY_FILE}"
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
 
@@ -172,6 +172,6 @@ done
 
 clean_old_repo
 add_repo "deb [arch=amd64] $REPOSITORY_BASE/$RELEASE $REPOSITORY devops"
-sudo DEBIAN_FRONTEND=noninteractive apt-get -q update
-sudo DEBIAN_FRONTEND=noninteractive apt-get install osm-devops
+sudo DEBIAN_FRONTEND=noninteractive apt-get -qy update
+sudo DEBIAN_FRONTEND=noninteractive apt-get -y install osm-devops
 $DEVOPS_PATH/installers/full_install_osm.sh -R $RELEASE -r $REPOSITORY -u $REPOSITORY_BASE -D $DEVOPS_PATH -t $DOCKER_TAG "$@"