finally support arm64, echo chosen os/arch

jpillora · Jul 26, 2022 · b4a6994 · b4a6994
1 parent 979937d
commit b4a6994
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/handler/strings.go b/handler/strings.go
@@ -6,7 +6,7 @@ import (
 )
 
 var (
-	archRe    = regexp.MustCompile(`(arm|386|amd64|32|64)`)
+	archRe    = regexp.MustCompile(`(arm64|arm|386|amd64|32|64)`)
 	fileExtRe = regexp.MustCompile(`(\.[a-z][a-z0-9]+)+$`)
 	posixOSRe = regexp.MustCompile(`(darwin|linux|(net|free|open)bsd|mac|osx|windows|win)`)
 )

diff --git a/scripts/install.sh.tmpl b/scripts/install.sh.tmpl
@@ -72,7 +72,12 @@ function install {
 	*) fail "No asset for platform ${OS}-${ARCH}";;
 	esac
 	#got URL! download it...
-	echo -n "{{ if .MoveToPath }}Installing{{ else }}Downloading{{ end }} $USER/$PROG $RELEASE"
+	echo -n "{{ if .MoveToPath }}Installing{{ else }}Downloading{{ end }}"
+	echo -n " $USER/$PROG"
+	if [ ! -z "$RELEASE" ]; then
+		echo -n " <$RELEASE>"
+	fi
+	echo -n " (${OS}/${ARCH})"
 	{{ if .Google }}
 	#matched using google, give time to cancel
 	echo -n " in 5 seconds"

diff --git a/scripts/install.txt.tmpl b/scripts/install.txt.tmpl
@@ -9,6 +9,8 @@ used-google: {{ .Google }}
 release assets:
 {{ range .Assets }}  {{ .URL }}
 {{end}}
+has-m1-asset: {{ .M1Asset }}
+
 to see shell script, append ?type=script
 for more information on this server, visit:
   github.com/jpillora/installer