@@ -106,7 +106,7 @@ configure_relay() {
106106
107107# Helper function to add relay extension
108108add_relay_helper () {
109- arch=" $( uname -m | sed ' s/_/-/ ' ) "
109+ local arch=$1
110110 os_suffix=" $( get_os_suffix) "
111111 openssl_suffix=" $( get_openssl_suffix) "
112112 artifact_file_name=" relay-$relay_version -php${version:? } -$os_suffix -$arch$openssl_suffix .tar.gz"
@@ -130,17 +130,24 @@ add_relay() {
130130 local ext=$1
131131 local arch
132132 local url
133+ local message
134+ local error
133135 os=$( uname -s)
136+ arch=" $( uname -m | sed ' s/_/-/' ) "
134137 relay_release=https://builds.r2.relay.so/meta/latest
135138 relay_trunk=https://builds.r2.relay.so
136- relay_version=$( get_relay_version " $ext " )
137- add_relay_dependencies > /dev/null 2>&1
138- if shared_extension relay; then
139- message=" Enabled"
139+ if [[ " $arch " = " x86-64" && " $os " = " Darwin" ]]; then
140+ error=" Relay extension is not available for macOS x86_64 architecture"
140141 else
141- add_relay_helper > /dev/null 2>&1
142- message=" Installed and enabled ${relay_version} "
142+ relay_version=$( get_relay_version " $ext " )
143+ add_relay_dependencies > /dev/null 2>&1
144+ if shared_extension relay; then
145+ message=" Enabled"
146+ else
147+ add_relay_helper " $arch " > /dev/null 2>&1
148+ message=" Installed and enabled ${relay_version} "
149+ fi
150+ configure_relay > /dev/null 2>&1
143151 fi
144- configure_relay > /dev/null 2>&1
145- add_extension_log relay " $message "
152+ add_extension_log relay " $message " " $error "
146153}
0 commit comments