From e7672992220178a5e10bc90f732fbf5f981ea92b Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Thu, 18 May 2023 22:26:42 +0000
Subject: [PATCH] feat: show both release number and name for debian

---
 distro.go               | 7 ++++++-
 distro/debian/debian.go | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/distro.go b/distro.go
index 48e6a0a..6511d9e 100644
--- a/distro.go
+++ b/distro.go
@@ -191,7 +191,12 @@ type DistroListCmd struct{}
 
 func (cmd *DistroListCmd) Run() (err error) {
 	for _, d := range distro.List() {
-		fmt.Println(d.ID, strings.Title(d.Release))
+		if d.ID == distro.Debian {
+			d.Release = fmt.Sprintf("%d %s",
+				debian.ReleaseFromString(d.Release),
+				strings.Title(d.Release))
+		}
+		fmt.Println(d.ID, d.Release)
 	}
 	return
 }
diff --git a/distro/debian/debian.go b/distro/debian/debian.go
index 126a633..04ba90e 100644
--- a/distro/debian/debian.go
+++ b/distro/debian/debian.go
@@ -56,7 +56,7 @@ func (d Debian) Equal(dd distro.Distro) bool {
 		return false
 	}
 
-	return releaseFromString(dd.Release) == d.release
+	return ReleaseFromString(dd.Release) == d.release
 }
 
 func (d Debian) Packages() (packages []string, err error) {
@@ -123,7 +123,7 @@ func (cn Release) String() string {
 	return ReleaseStrings[cn]
 }
 
-func releaseFromString(s string) (r Release) {
+func ReleaseFromString(s string) (r Release) {
 	switch strings.ToLower(s) {
 	case "7", "wheezy":
 		r = Wheezy
@@ -186,7 +186,7 @@ func Envs(km config.Target) (envs []string) {
 func ContainerImage(km config.Target) (image string) {
 	image += "debian:"
 
-	switch releaseFromString(km.Distro.Release) {
+	switch ReleaseFromString(km.Distro.Release) {
 	case Wheezy:
 		image += "wheezy-20190228"
 	case Jessie:
@@ -232,7 +232,7 @@ func repositories(release Release) (repos []string) {
 }
 
 func Runs(km config.Target) (commands []string) {
-	release := releaseFromString(km.Distro.Release)
+	release := ReleaseFromString(km.Distro.Release)
 
 	cmdf := func(f string, s ...interface{}) {
 		commands = append(commands, fmt.Sprintf(f, s...))