From 0cafeee86296b9f19e6425055e0c4037eff41985 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Tue, 23 Aug 2022 09:17:08 -0400
Subject: favor correctness by removing `apt update ...` short-circuiting (#98)

* favor correctness by removing apt update shortciruiting

* Update install.sh

* apt_get_upadate in node

* update test
---
 src/azure-cli/install.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/azure-cli/install.sh')

diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index 2c3c1c5..6518f6c 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -35,21 +35,16 @@ get_common_setting() {
     echo "$1=${!1}"
 }
 
-# Function to run apt-get if needed
-apt_get_update_if_needed()
+apt_get_update()
 {
-    if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update
-    else
-        echo "Skipping apt-get update."
-    fi
+    echo "Running apt-get update..."
+    apt-get update -y
 }
 
 # Checks if packages are installed and installs them if not
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
-        apt_get_update_if_needed
+        apt_get_update
         apt-get -y install --no-install-recommends "$@"
     fi
 }
@@ -127,7 +122,7 @@ install_using_apt() {
 install_using_pip() {
     echo "(*) No pre-built binaries available in apt-cache. Installing via pip3."
     if ! dpkg -s python3-minimal python3-pip libffi-dev python3-venv > /dev/null 2>&1; then
-        apt_get_update_if_needed
+        apt_get_update
         apt-get -y install python3-minimal python3-pip libffi-dev python3-venv
     fi
     export PIPX_HOME=/usr/local/pipx
-- 
cgit v1.2.3