Skip to content

Commit ea566b6

Browse files
committed
Fix support for relay
1 parent 4f124b9 commit ea566b6

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/scripts/extensions/relay.sh

+8-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
get_relay_version() {
33
local ext=$1
44
if [[ "$ext" =~ ^relay$ ]]; then
5-
get -s -n "" "${relay_releases:?}"/latest 2<&1 | grep -m 1 -Eo "tag/(v[0-9]+(\.[0-9]+)?(\.[0-9]+)?)" | head -n 1 | cut -d '/' -f 2
5+
if [ "${version:?}" = "7.4" ]; then
6+
echo 'v0.7.0'
7+
else
8+
get -s -n "" "${relay_releases:?}"/latest 2<&1 | grep -m 1 -Eo "tag/(v[0-9]+(\.[0-9]+)?(\.[0-9]+)?)" | head -n 1 | cut -d '/' -f 2
9+
fi
610
else
711
relay_version="${ext##*-}"
812
echo "v${relay_version/v//}"
@@ -40,6 +44,7 @@ change_library_paths() {
4044
install_name_tool -change "$(echo "${dylibs}" | grep -E "liblz4.*dylib" | xargs)" "$brew_prefix"/opt/lz4/lib/liblz4.dylib "$ext_dir"/relay.so
4145
install_name_tool -change "$(echo "${dylibs}" | grep -E "libssl.*dylib" | xargs)" "$brew_prefix"/opt/openssl@"$openssl_version"/lib/libssl.dylib "$ext_dir"/relay.so
4246
install_name_tool -change "$(echo "${dylibs}" | grep -E "libcrypto.*dylib" | xargs)" "$brew_prefix"/opt/openssl@"$openssl_version"/lib/libcrypto.dylib "$ext_dir"/relay.so
47+
install_name_tool -change "$(echo "${dylibs}" | grep -E "libck.*dylib" | xargs)" "$brew_prefix"/opt/concurrencykit/lib/libck.dylib "$ext_dir"/relay.so
4348
fi
4449
}
4550

@@ -51,7 +56,7 @@ add_relay_dependencies() {
5156
if [ "$os" = "Darwin" ]; then
5257
. "${0%/*}"/tools/brew.sh
5358
configure_brew
54-
brew install hiredis lz4 zstd
59+
brew install hiredis lz4 zstd concurrencykit
5560
fi
5661
}
5762

@@ -92,8 +97,7 @@ enable_relay() {
9297
# Patch binary id in relay extension
9398
init_relay_binary_id() {
9499
if [ -e "${ext_dir:?}"/relay.so ]; then
95-
grep -aq 00000000 "${ext_dir:?}"/relay.so && \
96-
sudo LC_ALL=C sed -i.bak "s/00000000-0000-0000-0000-000000000000/$(uuidgen)/" "$ext_dir"/relay.so
100+
sudo LC_ALL=C sed -i.bak "s/00000000-0000-0000-0000-000000000000/$(uuidgen)/" "$ext_dir"/relay.so || true
97101
fi
98102
}
99103

0 commit comments

Comments
 (0)