From cf1865a66e832aaf2d902f12155e40ec343e8241 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Tue, 24 Nov 2020 21:27:40 -0600
Subject: [PATCH] Improve RPi detection

- Add check for 64-bit versions of Raspberry Pi OS, e.g. Ubuntu 20.04
  on Raspberry Pi 4
- Ref: #852
---
 extras/ikev2setup.sh | 2 +-
 vpnsetup.sh          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/ikev2setup.sh b/extras/ikev2setup.sh
index 5f7611a..a7608ff 100644
--- a/extras/ikev2setup.sh
+++ b/extras/ikev2setup.sh
@@ -320,7 +320,7 @@ case "$swan_ver" in
     ;;
 esac
 
-if uname -m | grep -qi '^arm'; then
+if uname -m | grep -qi -e '^arm' -e '^aarch64'; then
   mobike_support=0
 fi
 
diff --git a/vpnsetup.sh b/vpnsetup.sh
index 5fd103a..28d0b1b 100755
--- a/vpnsetup.sh
+++ b/vpnsetup.sh
@@ -76,7 +76,7 @@ def_iface=$(route 2>/dev/null | grep -m 1 '^default' | grep -o '[^ ]*$')
 [ -z "$def_iface" ] && def_iface=$(ip -4 route list 0/0 2>/dev/null | grep -m 1 -Po '(?<=dev )(\S+)')
 def_state=$(cat "/sys/class/net/$def_iface/operstate" 2>/dev/null)
 if [ -n "$def_state" ] && [ "$def_state" != "down" ]; then
-  if ! uname -m | grep -qi '^arm'; then
+  if ! uname -m | grep -qi -e '^arm' -e '^aarch64'; then
     case "$def_iface" in
       wl*)
         exiterr "Wireless interface '$def_iface' detected. DO NOT run this script on your PC or Mac!"