From f7f679181d735f6c0d1419fbcbfc558be6b1a047 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Wed, 12 Jan 2022 20:14:12 +0530
Subject: [PATCH] Fix adding sudo to self-hosted runners

---
 src/scripts/linux.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh
index 59a300b2..a1338880 100644
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@@ -1,9 +1,13 @@
+# Function to add sudo
+add_sudo() {
+  if ! command -v sudo >/dev/null; then
+    check_package sudo || apt-get update
+    apt-get install -y sudo
+  fi
+}
+
 # Function to setup environment for self-hosted runners.
 self_hosted_helper() {
-  if ! command -v sudo >/dev/null; then
-    apt-get update
-    apt-get install -y sudo || add_log "${cross:?}" "sudo" "Could not install sudo"
-  fi
   if ! command -v apt-fast >/dev/null; then
     sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
     trap "sudo rm -f /usr/bin/apt-fast 2>/dev/null" exit
@@ -61,7 +65,7 @@ add_pdo_extension() {
 
 # Function to check if a package exists
 check_package() {
-  sudo apt-cache policy "$1" 2>/dev/null | grep -q 'Candidate'
+  apt-cache policy "$1" 2>/dev/null | grep -q 'Candidate'
 }
 
 # Function to add extensions.
@@ -201,7 +205,7 @@ setup_php() {
     fi
   fi
   if ! command -v php"$version" >/dev/null; then
-    add_log "$cross" "PHP" "Could not setup PHP $version"
+    add_log "${cross:?}" "PHP" "Could not setup PHP $version"
     exit 1
   fi
   semver=$(php_semver)
@@ -228,6 +232,8 @@ debconf_fix="DEBIAN_FRONTEND=noninteractive"
 apt_install="sudo $debconf_fix apt-fast install -y --no-install-recommends"
 scripts="${dist}"/../src/scripts
 
+add_sudo
+
 . /etc/os-release
 # shellcheck source=.
 . "${scripts:?}"/unix.sh