use types, fix missing cfg error, add wl-copy

cmd/andcli/aegis.go

@@ -57,7 +57,7 @@ func (e aegisEntry) toEntry() *entry {
 
 //
 
-func decryptAEGIS(data, password []byte) ([]entry, error) {
+func decryptAEGIS(data, password []byte) (entries, error) {
 
 	var vault aegisVault
 	if err := json.Unmarshal(data, &vault); err != nil {
@@ -79,12 +79,12 @@ func decryptAEGIS(data, password []byte) ([]entry, error) {
 		return nil, err
 	}
 
-	var entries []entry
+	var list entries
 	for _, e := range db.Entries {
-		entries = append(entries, *e.toEntry())
+		list = append(list, *e.toEntry())
 	}
 
-	return entries, nil
+	return list, nil
 }
 
 func deriveAegisMasterKey(v *aegisVault, password []byte) ([]byte, error) {

cmd/andcli/andcli_test.go

@@ -32,7 +32,7 @@ func TestDecrypt(t *testing.T) {
 				return
 			}
 			assert.NoError(t, err)
-			assert.IsType(t, []entry{}, e)
+			assert.IsType(t, entries{}, e)
 		})
 	}
 }

cmd/andcli/andotp.go

@@ -36,7 +36,7 @@ func (e andotpEntry) toEntry() *entry {
 
 //
 
-func decryptANDOTP(data, password []byte) ([]entry, error) {
+func decryptANDOTP(data, password []byte) (entries, error) {
 	b, err := andotp.Decrypt(data, string(password))
 	if err != nil {
 		return nil, err
@@ -47,10 +47,10 @@ func decryptANDOTP(data, password []byte) ([]entry, error) {
 		return nil, err
 	}
 
-	var entries []entry
+	var list entries
 	for _, e := range ae {
-		entries = append(entries, *e.toEntry())
+		list = append(list, *e.toEntry())
 	}
 
-	return entries, nil
+	return list, nil
 }

cmd/andcli/config.go

@@ -32,8 +32,9 @@ func newConfig(vaultFile, vaultType string) (*config, error) {
 			if err := os.MkdirAll(cfgDir, 0755); err != nil {
 				return nil, err
 			}
+		} else {
+			return nil, err
 		}
-		return nil, err
 	}
 
 	if _, err = os.Stat(cfgFile); err != nil {

cmd/andcli/main.go

@@ -33,7 +33,7 @@ var (
 	white   = color.New(color.FgWhite, color.Bold)
 	muted   = color.New(color.FgHiWhite, color.Faint)
 
-	// ui
+	// global ui stuff
 	copyCmd            = ""
 	current            = "" // holds an unformatted copy of the current token
 	copied             = false
@@ -81,38 +81,40 @@ func main() {
 		os.Exit(0)
 	}
 
+	prefix := danger.Sprint("[ERR]")
+
 	cfg, err := newConfig(vaultFile, vaultType)
 	if err != nil {
-		log.Fatal("[ERR] ", err)
+		log.Fatalf("%s: %s\n", prefix, err.Error())
 	}
 
 	if cfg.File == "" {
-		log.Fatal("[ERR] missing input file, specify one with -f")
+		log.Fatalf("%s: missing input file, specify one with -f\n", prefix)
 	}
 
 	if cfg.Type == "" {
-		log.Fatal("[ERR] missing vault type, specify one with -t")
+		log.Fatalf("%s: missing vault type, specify one with -t\n", prefix)
 	}
 
 	entries, err := decrypt(cfg.File, cfg.Type)
 	if err != nil {
-		log.Fatal("[ERR] ", err)
+		log.Fatalf("%s: %s\n", prefix, err.Error())
 	}
 
 	if err := cfg.save(); err != nil {
-		log.Fatal("[ERR] ", err)
+		log.Fatalf("%s: %s\n", prefix, err.Error())
 	}
 
 	output := termenv.DefaultOutput()
 	output.ClearScreen()
 
 	p := tea.NewProgram(newModel(output, cfg.File, entries...))
 	if _, err := p.Run(); err != nil {
-		log.Fatal("[ERR] ", err)
+		log.Fatalf("%s: %s\n", prefix, err.Error())
 	}
 }
 
-func decrypt(vaultFile, vaultType string, p ...[]byte) ([]entry, error) {
+func decrypt(vaultFile, vaultType string, p ...[]byte) (entries, error) {
 	fi, err := os.Stat(vaultFile)
 	if err != nil {
 		return nil, err

cmd/andcli/tea.go

@@ -37,7 +37,7 @@ func newModel(o *termenv.Output, filename string, entries ...entry) *model {
 		output:   o,
 	}
 
-	cmds := []string{"xclip", "pbcopy"} // linux, macos
+	cmds := []string{"xclip", "wl-copy", "pbcopy"} // xorg, wayland, macos
 	for _, c := range cmds {
 		if _, err := exec.LookPath(c); err == nil {
 			copyCmd = c