update

Author: cnlubo

myssh/keymg.go

@@ -211,17 +211,17 @@ func createDefaultSSHKey(env *Environment) error {
 			sp.Template = customTemplate
 			sp.ResultTemplate = resultTemplate
 			sp.SelectedChoiceStyle = func(c *selection.Choice) string {
-				a, _ := c.Value.(article)
+				a, _ := c.Value.(KeyType)
 
-				return blue.Bold().Styled(a.Name) + " " + termenv.String("("+a.ID+")").Faint().String()
+				return blue.Bold().Styled(a.Name) + " " + termenv.String("("+a.KeyBaseName+")").Faint().String()
 			}
 			sp.UnselectedChoiceStyle = func(c *selection.Choice) string {
-				a, _ := c.Value.(article)
+				a, _ := c.Value.(KeyType)
 
-				return a.Name + " " + termenv.String("("+a.ID+")").Faint().String()
+				return a.Name + " " + termenv.String("("+a.KeyBaseName+")").Faint().String()
 			}
 			sp.ExtendedTemplateFuncs = map[string]interface{}{
-				"name": func(c *selection.Choice) string { return c.Value.(article).Name },
+				"name": func(c *selection.Choice) string { return c.Value.(KeyType).Name },
 			}
 
 			choice, err := sp.RunPrompt()
@@ -797,4 +797,4 @@ func getDefaultKey(sshPath string) (error, string) {
 	}
 
 	return nil, keyfile
-}
+}

selection/choice.go

@@ -49,12 +49,11 @@ func Choices(sliceChoices interface{}) []*Choice {
 		choices := make([]*Choice, 0, slice.Len())
 		for i := 0; i < slice.Len(); i++ {
 			value := slice.Index(i).Interface()
-			//fmt.Println(value)
 			choices = append(choices, NewChoice(value))
 		}
 
 		return choices
 	default:
 		panic("SliceChoices argument is not a slice")
 	}
-}
+}