Merge pull request #2073 from nodejs/fix-update-script-for-apple-silicon

PeterDaveHello · web-flow · commit 138fbab280a0 · 2024-05-16T04:29:13.000+08:00
diff --git a/functions.sh b/functions.sh
@@ -32,14 +32,14 @@ function get_arch() {
     s390x)
       arch="s390x"
       ;;
-    aarch64)
+    aarch64 | arm64)
       arch="arm64"
       ;;
     armv7l)
       arch="arm32v7"
       ;;
     *)
-      echo "$0 does not support architecture ${arch} ... aborting"
+      echo "$0 does not support architecture ${arch:-unknown} ... aborting"
       exit 1
       ;;
   esac
diff --git a/update.sh b/update.sh
@@ -126,7 +126,7 @@ function update_node_version() {
   (
     cp "${template}" "${dockerfile}-tmp"
     local fromprefix=""
-    if [ "${arch}" != "amd64" ]; then
+    if [ "${arch}" != "amd64" ] && [ "${arch}" != "arm64" ]; then
       fromprefix="${arch}\\/"
     fi
 

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ function update_node_version() {`
`126`	`126`	`(`
`127`	`127`	`cp "${template}" "${dockerfile}-tmp"`
`128`	`128`	`local fromprefix=""`
`129`		`- if [ "${arch}" != "amd64" ]; then`
	`129`	`+ if [ "${arch}" != "amd64" ] && [ "${arch}" != "arm64" ]; then`
`130`	`130`	`fromprefix="${arch}\\/"`
`131`	`131`	`fi`
`132`	`132`