From 8d7896acff02170388b4ada48bd01dd9d74198ca Mon Sep 17 00:00:00 2001 From: gggeek Date: Wed, 30 Nov 2022 11:31:09 +0000 Subject: [PATCH] avoid lsb_release --- tests/ci/setup/install_packages.sh | 2 +- tests/ci/setup/setup_php.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/ci/setup/install_packages.sh b/tests/ci/setup/install_packages.sh index 21db28e5..e9f3e9cd 100755 --- a/tests/ci/setup/install_packages.sh +++ b/tests/ci/setup/install_packages.sh @@ -7,6 +7,6 @@ set -e echo "Installing base software packages..." DEBIAN_FRONTEND=noninteractive apt-get install -y \ - lsb-release sudo unzip wget + sudo unzip wget echo "Done installing base software packages" diff --git a/tests/ci/setup/setup_php.sh b/tests/ci/setup/setup_php.sh index 06c2ebe9..e3f364d8 100755 --- a/tests/ci/setup/setup_php.sh +++ b/tests/ci/setup/setup_php.sh @@ -28,7 +28,14 @@ configure_php_ini() { # install php PHP_VERSION="$1" -DEBIAN_VERSION="$(lsb_release -s -c)" +# `lsb-release` is not necessarily onboard. We parse /etc/os-release instead +DEBIAN_VERSION=$(cat /etc/os-release | grep 'VERSION_CODENAME=' | sed 's/VERSION_CODENAME=//') +if [ -z "${DEBIAN_VERSION}" ]; then + # Example strings: + # VERSION="14.04.6 LTS, Trusty Tahr" + # VERSION="8 (jessie)" + DEBIAN_VERSION=$(cat /etc/os-release | grep 'VERSION=' | grep 'VERSION=' | sed 's/VERSION=//' | sed 's/"[0-9.]\+ *(\?//' | sed 's/)\?"//' | tr '[:upper:]' '[:lower:]' | sed 's/lts, *//' | sed 's/ \+tahr//') +fi # @todo use native packages if requested for a specific version and that is the same as available in the os repos -- 2.47.0