From e55d3e49e1ec3a92f9ed858d65d61ea3a045e357 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Thu, 21 May 2020 21:57:35 -0400
Subject: [PATCH] Bundle in libicu on macOS

Closes #1710

Also reported in #1640
---
 ci/build/build-static-release.sh | 13 +++++++++++--
 ci/build/code-server.sh          |  8 ++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ci/build/build-static-release.sh b/ci/build/build-static-release.sh
index 1283c116b..24af32f0b 100755
--- a/ci/build/build-static-release.sh
+++ b/ci/build/build-static-release.sh
@@ -20,6 +20,10 @@ main() {
   if [[ $OS == "linux" ]]; then
     bundle_dynamic_lib libstdc++
     bundle_dynamic_lib libgcc_s
+  elif [[ $OS == "macos" ]]; then
+    bundle_dynamic_lib libicui18n
+    bundle_dynamic_lib libicuuc
+    bundle_dynamic_lib libicudata
   fi
 
   ln -s "./bin/code-server" "$RELEASE_PATH/code-server"
@@ -31,9 +35,14 @@ main() {
 
 bundle_dynamic_lib() {
   lib_name="$1"
-  lib_path="$(ldd "$RELEASE_PATH/lib/node" | grep "$lib_name" | awk '{print $3 }')"
 
-  cp "$lib_path" "$RELEASE_PATH/lib/"
+  if [[ $OS == "linux" ]]; then
+    lib_path="$(ldd "$RELEASE_PATH/lib/node" | grep "$lib_name" | awk '{print $3 }')"
+  elif [[ $OS == "macos" ]]; then
+    lib_path="$(otool -L "$RELEASE_PATH/lib/node" | grep "$lib_name" | awk '{print $1 }')"
+  fi
+
+  cp "$lib_path" "$RELEASE_PATH/lib"
 }
 
 main "$@"
diff --git a/ci/build/code-server.sh b/ci/build/code-server.sh
index d998f32e1..0d1ecf145 100755
--- a/ci/build/code-server.sh
+++ b/ci/build/code-server.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 # This script is intended to be bundled into the static releases.
 # Runs code-server with the bundled Node binary.
@@ -17,5 +17,9 @@ bin_dir() {
 }
 
 BIN_DIR=$(bin_dir)
-export LD_LIBRARY_PATH="$BIN_DIR/../lib${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
+if [ "$(uname)" = "Linux"]; then
+  export LD_LIBRARY_PATH="$BIN_DIR/../lib${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
+else
+  export DYLD_LIBRARY_PATH="$BIN_DIR/../lib${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
+fi
 exec "$BIN_DIR/../lib/node" "$BIN_DIR/.." "$@"