From d8de30560bd357198e59c76de666b92d3b5c5755 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Thu, 26 Nov 2020 11:06:55 +0530 Subject: [PATCH] Fix fetching extension version from PECL on macOS --- src/scripts/darwin.sh | 4 ++-- src/scripts/linux.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scripts/darwin.sh b/src/scripts/darwin.sh index 83d3267c..585fff13 100644 --- a/src/scripts/darwin.sh +++ b/src/scripts/darwin.sh @@ -46,9 +46,9 @@ get_pecl_version() { stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")" pecl_rest='https://pecl.php.net/rest/r/' response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml) - pecl_version=$(echo "$response" | grep -m 1 -Eio "(\d*\.\d*\.\d*$stability\d*)") + pecl_version=$(echo "$response" | grep -m 1 -Eio "([0-9]+\.[0-9]+\.[0-9]+${stability}[0-9]+)") if [ ! "$pecl_version" ]; then - pecl_version=$(echo "$response" | grep -m 1 -Eo "(\d*\.\d*\.\d*)") + pecl_version=$(echo "$response" | grep -m 1 -Eo "([0-9]+\.[0-9]+\.[0-9]+)") fi echo "$pecl_version" } diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh index 7cb6ca83..395f913f 100644 --- a/src/scripts/linux.sh +++ b/src/scripts/linux.sh @@ -52,9 +52,9 @@ get_pecl_version() { stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot|preview)")" pecl_rest='https://pecl.php.net/rest/r/' response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml) - pecl_version=$(echo "$response" | grep -m 1 -Pio "(\d*\.\d*\.\d*$stability\d*)") + pecl_version=$(echo "$response" | grep -m 1 -Eio "([0-9]+\.[0-9]+\.[0-9]+${stability}[0-9]+)") if [ ! "$pecl_version" ]; then - pecl_version=$(echo "$response" | grep -m 1 -Po "(\d*\.\d*\.\d*)") + pecl_version=$(echo "$response" | grep -m 1 -Eo "([0-9]+\.[0-9]+\.[0-9]+)") fi echo "$pecl_version" }