Skip to content

Commit b84bdfd

Browse files
Patches setup script for Mx macs (#540)
1 parent 361a0df commit b84bdfd

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

scripts/setup-beta.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,9 @@ if ($os -match "Windows") {
6060
exit 1
6161
}
6262
} elseif ($os -match "Darwin") {
63-
if ($arch -eq "X64") {
63+
# temporary workaround to install devproxy on Mx macs
64+
if ($arch -eq "X64" -or $arch -eq "Arm64") {
6465
$url = "$base_url-osx-x64-$version.zip"
65-
} elseif ($arch -eq "Arm64") {
66-
$url = "$base_url-osx-arm64-$version.zip"
6766
} else {
6867
Write-Host "Unsupported architecture $arch. Aborting"
6968
exit 1

scripts/setup-beta.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ base_url="https://github.com/microsoft/dev-proxy/releases/download/$version/dev-
4848

4949
if [ "$(uname)" == "Darwin" ]; then
5050
ARCH="$(uname -m)"
51-
if [ ${ARCH} == "arm64" ]; then
52-
curl -sL -o ./devproxy.zip "$base_url-osx-arm64-$version.zip" || { echo "Cannot install Dev Proxy. Aborting"; exit 1; }
53-
elif [ ${ARCH} == "x86_64" ]; then
51+
# temporary workaround to install devproxy on Mx macs
52+
if [ ${ARCH} == "x86_64" ] || [ ${ARCH} == "arm64" ]; then
5453
curl -sL -o ./devproxy.zip "$base_url-osx-x64-$version.zip" || { echo "Cannot install Dev Proxy. Aborting"; exit 1; }
5554
else
5655
echo "unsupported architecture ${ARCH}"

scripts/setup.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ if ($os -match "Windows") {
5959
exit 1
6060
}
6161
} elseif ($os -match "Darwin") {
62-
if ($arch -eq "X64") {
62+
# temporary workaround to install devproxy on Mx macs
63+
if ($arch -eq "X64" -or $arch -eq "Arm64") {
6364
$url = "$base_url-osx-x64-$version.zip"
64-
} elseif ($arch -eq "Arm64") {
65-
$url = "$base_url-osx-arm64-$version.zip"
6665
} else {
6766
Write-Host "Unsupported architecture $arch. Aborting"
6867
exit 1

scripts/setup.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,8 @@ base_url="https://github.com/microsoft/dev-proxy/releases/download/$version/dev-
4747

4848
if [ "$(uname)" == "Darwin" ]; then
4949
ARCH="$(uname -m)"
50-
if [ ${ARCH} == "arm64" ]; then
51-
curl -sL -o ./devproxy.zip "$base_url-osx-arm64-$version.zip" || { echo "Cannot install Dev Proxy. Aborting"; exit 1; }
52-
elif [ ${ARCH} == "x86_64" ]; then
50+
# temporary workaround to install devproxy on Mx macs
51+
if [ ${ARCH} == "x86_64" ] || [ ${ARCH} == "arm64" ]; then
5352
curl -sL -o ./devproxy.zip "$base_url-osx-x64-$version.zip" || { echo "Cannot install Dev Proxy. Aborting"; exit 1; }
5453
else
5554
echo "unsupported architecture ${ARCH}"

0 commit comments

Comments
 (0)