From 8ace7bdc6e6fa5174e2e1c8e133a986035daca41 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Tue, 27 Jul 2021 23:30:00 +0530
Subject: [PATCH] Switch to /etc/os-release on Linux

Improve self-hosted support
---
 src/scripts/ext/couchbase.sh | 2 +-
 src/scripts/linux.sh         | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/scripts/ext/couchbase.sh b/src/scripts/ext/couchbase.sh
index c37f4912..114743f4 100644
--- a/src/scripts/ext/couchbase.sh
+++ b/src/scripts/ext/couchbase.sh
@@ -7,7 +7,7 @@ add_couchbase_libs() {
     else
       release="$(curl -sL $trunk/latest | grep -Eo "libcouchbase-[0-9]+\.[0-9]+\.[0-9]+" | head -n 1 | cut -d'-' -f 2)"
     fi
-    deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu${DISTRIB_RELEASE/./}_${DISTRIB_CODENAME}_amd64.tar"
+    deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu${VERSION_ID/./}_${VERSION_CODENAME}_amd64.tar"
     get -q -n /tmp/libcouchbase.tar "$deb_url"
     sudo tar -xf /tmp/libcouchbase.tar -C /tmp
     install_packages libev4 libevent-dev
diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh
index e9a42a3e..228fff46 100644
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@@ -1,7 +1,11 @@
 # Function to setup environment for self-hosted runners.
 self_hosted_helper() {
+  if ! command -v sudo >/dev/null; then
+    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
   fi
   install_packages apt-transport-https curl make software-properties-common unzip autoconf automake gcc g++
   add_ppa ondrej/php
@@ -270,11 +274,11 @@ debconf_fix="DEBIAN_FRONTEND=noninteractive"
 apt_install="sudo $debconf_fix apt-fast install -y"
 scripts="${dist}"/../src/scripts
 
+. /etc/os-release
 # shellcheck source=.
 . "${scripts:?}"/ext/source.sh
 . "${scripts:?}"/tools/add_tools.sh
 . "${scripts:?}"/common.sh
-. /etc/lsb-release
 read_env
 self_hosted_setup
 setup_php