X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=main.go;fp=main.go;h=38d2cb08d6434900b790d370a1856a106880fd78;hb=9c0dca60b83668053c20d5589272fbf1439f7834;hp=b52d52ab1a3f5f27a7e179124f2690bc9a6c640e;hpb=4a1c37540658a82e4c5f697d46f7c63ef8dc05e8;p=mmfileget.git

diff --git a/main.go b/main.go
index b52d52a..38d2cb0 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path/filepath"
 	"strings"
 
 	"github.com/mattermost/mattermost-server/v5/model"
@@ -15,28 +14,7 @@ func main() {
 	s := strings.Split(url, "/")
 	machine, fileId := s[2], s[6]
 
-	netrcPath, ok := os.LookupEnv("NETRC")
-	if !ok {
-		netrcPath = filepath.Join(os.Getenv("HOME"), ".netrc")
-	}
-	data, err := ioutil.ReadFile(netrcPath)
-	if err != nil {
-		panic(err)
-	}
-	var login string
-	var password string
-	for _, line := range strings.Split(string(data), "\n") {
-		if i := strings.Index(line, "#"); i >= 0 {
-			line = line[:i]
-		}
-		f := strings.Fields(line)
-		if len(f) >= 6 &&
-			f[0] == "machine" && f[1] == machine &&
-			f[2] == "login" && f[4] == "password" {
-			login, password = f[3], f[5]
-			break
-		}
-	}
+	login, password := findInNetrc(machine)
 	if login == "" || password == "" {
 		fmt.Fprintln(os.Stderr, "No credentials found for:", machine)
 		os.Exit(1)
@@ -59,8 +37,8 @@ func main() {
 		fmt.Fprintln(os.Stderr, "Download? Ctrl-D/C")
 		os.Stdin.Read(make([]byte, 1))
 	}
-	data, _ = Client.GetFile(fileId)
-	if err = ioutil.WriteFile(filename, data, os.FileMode(0666)); err != nil {
+	data, _ := Client.GetFile(fileId)
+	if err := ioutil.WriteFile(filename, data, os.FileMode(0666)); err != nil {
 		panic(err)
 	}
 }