Make .chezmoi.kernel template variable more generic

twpayne · Jul 13, 2021 · 7c688ef · 7c688ef
1 parent dcf0ba1
commit 7c688ef
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/internal/chezmoi/data.go b/internal/chezmoi/data.go
@@ -15,8 +15,8 @@ import (
 	"github.com/twpayne/go-vfs/v3"
 )
 
-// KernelInfo returns the kernel information parsed from /proc/sys/kernel.
-func KernelInfo(fileSystem vfs.FS) (map[string]string, error) {
+// Kernel returns the kernel information parsed from /proc/sys/kernel.
+func Kernel(fileSystem vfs.FS) (map[string]interface{}, error) {
 	const procSysKernel = "/proc/sys/kernel"
 
 	info, err := fileSystem.Stat(procSysKernel)
@@ -31,7 +31,7 @@ func KernelInfo(fileSystem vfs.FS) (map[string]string, error) {
 		return nil, nil
 	}
 
-	kernelInfo := make(map[string]string)
+	kernel := make(map[string]interface{})
 	for _, filename := range []string{
 		"osrelease",
 		"ostype",
@@ -46,9 +46,9 @@ func KernelInfo(fileSystem vfs.FS) (map[string]string, error) {
 		case err != nil:
 			return nil, err
 		}
-		kernelInfo[filename] = string(bytes.TrimSpace(data))
+		kernel[filename] = string(bytes.TrimSpace(data))
 	}
-	return kernelInfo, nil
+	return kernel, nil
 }
 
 // OSRelease returns the operating system identification data as defined by the

diff --git a/internal/chezmoi/data_test.go b/internal/chezmoi/data_test.go
@@ -11,11 +11,11 @@ import (
 	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
-func TestKernelInfo(t *testing.T) {
+func TestKernel(t *testing.T) {
 	for _, tc := range []struct {
-		name               string
-		root               interface{}
-		expectedKernelInfo map[string]string
+		name           string
+		root           interface{}
+		expectedKernel map[string]interface{}
 	}{
 		{
 			name: "windows_services_for_linux",
@@ -26,7 +26,7 @@ func TestKernelInfo(t *testing.T) {
 					"version":   "#1 SMP Debian 5.2.9-2 (2019-08-21)\n",
 				},
 			},
-			expectedKernelInfo: map[string]string{
+			expectedKernel: map[string]interface{}{
 				"osrelease": "4.19.81-microsoft-standard",
 				"ostype":    "Linux",
 				"version":   "#1 SMP Debian 5.2.9-2 (2019-08-21)",
@@ -39,7 +39,7 @@ func TestKernelInfo(t *testing.T) {
 					"version": "#1 SMP Debian 5.2.9-2 (2019-08-21)\n",
 				},
 			},
-			expectedKernelInfo: map[string]string{
+			expectedKernel: map[string]interface{}{
 				"version": "#1 SMP Debian 5.2.9-2 (2019-08-21)",
 			},
 		},
@@ -48,14 +48,14 @@ func TestKernelInfo(t *testing.T) {
 			root: map[string]interface{}{
 				"/proc/sys": &vfst.Dir{Perm: 0o755},
 			},
-			expectedKernelInfo: nil,
+			expectedKernel: nil,
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			chezmoitest.WithTestFS(t, tc.root, func(fileSystem vfs.FS) {
-				actual, err := KernelInfo(fileSystem)
+				actual, err := Kernel(fileSystem)
 				assert.NoError(t, err)
-				assert.Equal(t, tc.expectedKernelInfo, actual)
+				assert.Equal(t, tc.expectedKernel, actual)
 			})
 		})
 	}

diff --git a/internal/cmd/config.go b/internal/cmd/config.go
@@ -686,12 +686,12 @@ func (c *Config) defaultTemplateData() map[string]interface{} {
 			Msg("os.Hostname")
 	}
 
-	if kernelInfo, err := chezmoi.KernelInfo(c.fileSystem); err == nil {
-		data["kernel"] = kernelInfo
+	if kernel, err := chezmoi.Kernel(c.fileSystem); err == nil {
+		data["kernel"] = kernel
 	} else {
 		log.Debug().
 			Err(err).
-			Msg("chezmoi.KernelInfo")
+			Msg("chezmoi.Kernel")
 	}
 
 	if osRelease, err := chezmoi.OSRelease(c.fileSystem); err == nil {