diff --git a/src/scripts/extensions/couchbase.sh b/src/scripts/extensions/couchbase.sh index 3c84dd54..2427b709 100644 --- a/src/scripts/extensions/couchbase.sh +++ b/src/scripts/extensions/couchbase.sh @@ -5,7 +5,7 @@ add_couchbase_clibs() { if [[ "$ext" =~ couchbase-2.+ ]]; then release="2.10.9" else - release="$(curl -sL $trunk/latest | grep -Eo "libcouchbase-[0-9]+\.[0-9]+\.[0-9]+" | head -n 1 | cut -d'-' -f 2)" + release=$(get -s -n "" "$trunk"/latest | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+" | head -n 1) fi [ "$VERSION_ID" = "22.04" ] && vid=20.04 || vid="$VERSION_ID" [ "$VERSION_CODENAME" = "jammy" ] && vcn=focal || vcn="$VERSION_CODENAME" @@ -69,7 +69,7 @@ add_couchbase() { fi else if [ -e "${ext_dir:?}"/libcouchbase_php_core.dylib ]; then - sudo cp "${ext_dir:?}"/libcouchbase_php_core.dylib ${brew_prefix:?}/lib + sudo cp "${ext_dir:?}"/libcouchbase_php_core.dylib "${brew_prefix:?}"/lib fi add_brew_extension couchbase extension fi diff --git a/src/scripts/extensions/firebird.sh b/src/scripts/extensions/firebird.sh index 5aed7ed8..065afb3a 100644 --- a/src/scripts/extensions/firebird.sh +++ b/src/scripts/extensions/firebird.sh @@ -1,6 +1,7 @@ add_firebird_client_darwin() { firebird_tag='R3_0_7' - pkg_name=$(get -s -n "" https://github.com/FirebirdSQL/firebird/releases/tag/"$firebird_tag" | grep -Eo "Firebird-.*.pkg" | head -n 1) + pkg_name=$(get -s -n "" https://api.github.com/repos/FirebirdSQL/firebird/releases/tags/"$firebird_tag" | grep -Eo "Firebird-.*.pkg" | head -n 1) + [ -z "$pkg_name" ] && pkg_name=$(get -s -n "" https://github.com/FirebirdSQL/firebird/releases/expanded_assets/"$firebird_tag" | grep -Eo "Firebird-.*.pkg" | head -n 1) get -q -e "/tmp/firebird.pkg" https://github.com/FirebirdSQL/firebird/releases/download/"$firebird_tag"/"$pkg_name" sudo installer -pkg /tmp/firebird.pkg -target / sudo mkdir -p /opt/firebird/include /opt/firebird/lib