aboutsummaryrefslogtreecommitdiff
path: root/src/powershell/install.sh
diff options
context:
space:
mode:
authorJosh Spicer <joshspicer@github.com>2022-08-23 16:17:08 +0300
committerGitHub <noreply@github.com>2022-08-23 16:17:08 +0300
commit0cafeee86296b9f19e6425055e0c4037eff41985 (patch)
tree1320a7b4c79a9a676e30632117bbd5a955b673ba /src/powershell/install.sh
parent58e425039a1dc78cde64e9c1939e2a3dfed6d22a (diff)
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
Diffstat (limited to 'src/powershell/install.sh')
-rwxr-xr-xsrc/powershell/install.sh15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index e686ecc..328ae93 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -72,21 +72,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
}
@@ -123,7 +118,7 @@ install_using_github() {
# Fall back on direct download if no apt package exists in microsoft pool
check_packages curl ca-certificates gnupg2 dirmngr libc6 libgcc1 libgssapi-krb5-2 libstdc++6 libunwind8 libuuid1 zlib1g libicu[0-9][0-9]
if ! type git > /dev/null 2>&1; then
- apt_get_update_if_needed
+ apt_get_update
apt-get install -y --no-install-recommends git
fi
if [ "${architecture}" = "amd64" ]; then