diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-10-06 09:25:23 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-10-07 11:41:21 +0200 |
| commit | fac4f3b19d47999537e56655ab70f10c520a213e (patch) | |
| tree | 462e53c16cba19c58101cec411ff9886eaf04411 /gui/scripts | |
| parent | a9c2744b96a5c648336f02927df27c66cf90ebc2 (diff) | |
| download | mullvadvpn-fac4f3b19d47999537e56655ab70f10c520a213e.tar.xz mullvadvpn-fac4f3b19d47999537e56655ab70f10c520a213e.zip | |
Enable build of proto files for ARM64 Macs
Diffstat (limited to 'gui/scripts')
| -rwxr-xr-x | gui/scripts/build-proto.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/scripts/build-proto.sh b/gui/scripts/build-proto.sh index 5f8724a68c..7cb0d989c4 100755 --- a/gui/scripts/build-proto.sh +++ b/gui/scripts/build-proto.sh @@ -6,7 +6,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd "$SCRIPT_DIR" ARCH="$(uname -m)" -PLATFORM="$(uname -s)-${ARCH}" +PLATFORM="$(uname -s)" MANAGEMENT_INTERFACE_PROTO_BUILD_DIR=${MANAGEMENT_INTERFACE_PROTO_BUILD_DIR:-} NODE_MODULES_DIR="$(cd ../node_modules/.bin && pwd)" PROTO_DIR="../../mullvad-management-interface/proto" @@ -22,7 +22,7 @@ fi mkdir -p $DESTINATION_DIR mkdir -p $TYPES_DESTINATION_DIR -if [[ "${ARCH,,}" == "arm64" || "${ARCH,,}" == "aarch64" ]]; then +if [[ "$PLATFORM" == "Linux" && ("${ARCH,,}" == "arm64" || "${ARCH,,}" == "aarch64") ]]; then if [[ -n "${MANAGEMENT_INTERFACE_PROTO_BUILD_DIR}" ]]; then cp $MANAGEMENT_INTERFACE_PROTO_BUILD_DIR/*.js $DESTINATION_DIR cp $MANAGEMENT_INTERFACE_PROTO_BUILD_DIR/*.ts $TYPES_DESTINATION_DIR |