Make .chezmoi.osRelease template variable more generic

twpayne · Jul 13, 2021 · dcf0ba1 · dcf0ba1
1 parent 9d74f07
commit dcf0ba1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/internal/chezmoi/data.go b/internal/chezmoi/data.go
@@ -53,7 +53,7 @@ func KernelInfo(fileSystem vfs.FS) (map[string]string, error) {
 
 // OSRelease returns the operating system identification data as defined by the
 // os-release specification.
-func OSRelease(fileSystem vfs.FS) (map[string]string, error) {
+func OSRelease(fileSystem vfs.FS) (map[string]interface{}, error) {
 	for _, filename := range []string{
 		"/usr/lib/os-release",
 		"/etc/os-release",
@@ -85,8 +85,8 @@ func maybeUnquote(s string) string {
 
 // parseOSRelease parses operating system identification data from r as defined
 // by the os-release specification.
-func parseOSRelease(r io.Reader) (map[string]string, error) {
-	result := make(map[string]string)
+func parseOSRelease(r io.Reader) (map[string]interface{}, error) {
+	result := make(map[string]interface{})
 	s := bufio.NewScanner(r)
 	for s.Scan() {
 		// Trim all leading whitespace, but not necessarily trailing whitespace.

diff --git a/internal/chezmoi/data_test.go b/internal/chezmoi/data_test.go
@@ -65,7 +65,7 @@ func TestOSRelease(t *testing.T) {
 	for _, tc := range []struct {
 		name     string
 		root     map[string]interface{}
-		expected map[string]string
+		expected map[string]interface{}
 	}{
 		{
 			name: "fedora",
@@ -82,7 +82,7 @@ func TestOSRelease(t *testing.T) {
 					`BUG_REPORT_URL="https://bugzilla.redhat.com/"`,
 				),
 			},
-			expected: map[string]string{
+			expected: map[string]interface{}{
 				"NAME":           "Fedora",
 				"VERSION":        "17 (Beefy Miracle)",
 				"ID":             "fedora",
@@ -112,7 +112,7 @@ func TestOSRelease(t *testing.T) {
 					`UBUNTU_CODENAME=bionic`,
 				),
 			},
-			expected: map[string]string{
+			expected: map[string]interface{}{
 				"NAME":               "Ubuntu",
 				"VERSION":            "18.04.1 LTS (Bionic Beaver)",
 				"ID":                 "ubuntu",
@@ -142,7 +142,7 @@ func TestParseOSRelease(t *testing.T) {
 	for _, tc := range []struct {
 		name     string
 		s        string
-		expected map[string]string
+		expected map[string]interface{}
 	}{
 		{
 			name: "fedora",
@@ -157,7 +157,7 @@ func TestParseOSRelease(t *testing.T) {
 				`HOME_URL="https://fedoraproject.org/"`,
 				`BUG_REPORT_URL="https://bugzilla.redhat.com/"`,
 			),
-			expected: map[string]string{
+			expected: map[string]interface{}{
 				"NAME":           "Fedora",
 				"VERSION":        "17 (Beefy Miracle)",
 				"ID":             "fedora",
@@ -188,7 +188,7 @@ func TestParseOSRelease(t *testing.T) {
 				`VERSION_CODENAME=bionic`,
 				`UBUNTU_CODENAME=bionic`,
 			),
-			expected: map[string]string{
+			expected: map[string]interface{}{
 				"NAME":               "Ubuntu",
 				"VERSION":            "18.04.1 LTS (Bionic Beaver)",
 				"ID":                 "ubuntu",

diff --git a/internal/cmd/doctorcmd.go b/internal/cmd/doctorcmd.go
@@ -346,7 +346,11 @@ func (osArchCheck) Name() string {
 func (osArchCheck) Run() (checkResult, string) {
 	fields := []string{runtime.GOOS + "/" + runtime.GOARCH}
 	if osRelease, err := chezmoi.OSRelease(vfs.OSFS); err == nil {
-		fields = append(fields, "("+osRelease["NAME"]+"/"+osRelease["VERSION"]+")")
+		if name, ok := osRelease["NAME"].(string); ok {
+			if version, ok := osRelease["VERSION"].(string); ok {
+				fields = append(fields, "("+name+"/"+version+")")
+			}
+		}
 	}
 	return checkOK, strings.Join(fields, " ")
 }

diff --git a/internal/cmd/upgradecmd_unix.go b/internal/cmd/upgradecmd_unix.go
@@ -469,12 +469,12 @@ func getPackageType(fileSystem vfs.FS) (string, error) {
 	if err != nil {
 		return packageTypeNone, err
 	}
-	if id, ok := osRelease["ID"]; ok {
+	if id, ok := osRelease["ID"].(string); ok {
 		if packageType, ok := packageTypeByID[id]; ok {
 			return packageType, nil
 		}
 	}
-	if idLikes, ok := osRelease["ID_LIKE"]; ok {
+	if idLikes, ok := osRelease["ID_LIKE"].(string); ok {
 		for _, id := range strings.Split(idLikes, " ") {
 			if packageType, ok := packageTypeByID[id]; ok {
 				return packageType, nil

diff --git a/internal/cmd/util.go b/internal/cmd/util.go
@@ -144,8 +144,8 @@ func uniqueAbbreviations(values []string) map[string]string {
 
 // upperSnakeCaseToCamelCaseKeys returns m with all keys converted from
 // UPPER_SNAKE_CASE to camelCase.
-func upperSnakeCaseToCamelCaseMap(m map[string]string) map[string]string {
-	result := make(map[string]string)
+func upperSnakeCaseToCamelCaseMap(m map[string]interface{}) map[string]interface{} {
+	result := make(map[string]interface{})
 	for k, v := range m {
 		result[upperSnakeCaseToCamelCase(k)] = v
 	}

diff --git a/internal/cmd/util_test.go b/internal/cmd/util_test.go
@@ -124,11 +124,11 @@ func TestUniqueAbbreviations(t *testing.T) {
 }
 
 func TestUpperSnakeCaseToCamelCaseMap(t *testing.T) {
-	actual := upperSnakeCaseToCamelCaseMap(map[string]string{
+	actual := upperSnakeCaseToCamelCaseMap(map[string]interface{}{
 		"BUG_REPORT_URL": "",
 		"ID":             "",
 	})
-	assert.Equal(t, map[string]string{
+	assert.Equal(t, map[string]interface{}{
 		"bugReportURL": "",
 		"id":           "",
 	}, actual)