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/rust/install.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/rust')

diff --git a/src/rust/install.sh b/src/rust/install.sh
index a84716c..d8d3b74 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -125,22 +125,17 @@ updaterc() {
     fi
 }
 
-# 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
 }
 
 export DEBIAN_FRONTEND=noninteractive
 
 # Install curl, lldb, python3-minimal,libpython and rust dependencies if missing
 if ! dpkg -s curl ca-certificates gnupg2 lldb python3-minimal gcc libc6-dev > /dev/null 2>&1; then
-    apt_get_update_if_needed
+    apt_get_update
     apt-get -y install --no-install-recommends curl ca-certificates gcc libc6-dev
     apt-get -y install lldb python3-minimal libpython3.?
 fi
@@ -175,7 +170,7 @@ else
     if [ "${RUST_VERSION}" != "latest" ] && [ "${RUST_VERSION}" != "lts" ] && [ "${RUST_VERSION}" != "stable" ]; then
         # Find version using soft match
         if ! type git > /dev/null 2>&1; then
-            apt_get_update_if_needed
+            apt_get_update
             apt-get -y install --no-install-recommends git
         fi
 
-- 
cgit v1.2.3