From 84e59e6b67734086332d973d97965174be504c92 Mon Sep 17 00:00:00 2001 From: Jean-Louis Huynen Date: Wed, 8 Jan 2020 15:20:56 +0100 Subject: [PATCH] chg [lib] remove requirements, update isNet --- config/config.go | 11 +++++------ requirements.go | 7 ------- 2 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 requirements.go diff --git a/config/config.go b/config/config.go index e95d980..e003b37 100644 --- a/config/config.go +++ b/config/config.go @@ -73,7 +73,7 @@ func validPort(port string) bool { } // ReadConfigFile takes two argument: folder and fileName. -// It reads its content, trims\n, and return []byte +// It reads its content, trims\n and \r, and return []byte // All errors are Fatal. func ReadConfigFile(folder string, fileName string) []byte { f, err := os.OpenFile("./"+folder+"/"+fileName, os.O_RDWR|os.O_CREATE, 0666) @@ -88,12 +88,11 @@ func ReadConfigFile(folder string, fileName string) []byte { log.Fatal(err) } } - if count == 0 { - log.Fatal(fileName + " is empty.") - } if err := f.Close(); err != nil { log.Fatal(err) } - // trim \n if present - return bytes.TrimSuffix(data[:count], []byte("\n")) + + // trim \r and \n if present + r := bytes.TrimSuffix(data[:count], []byte("\n")) + return bytes.TrimSuffix(r, []byte("\r")) } diff --git a/requirements.go b/requirements.go deleted file mode 100644 index 40aabe4..0000000 --- a/requirements.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import ( - _ "github.com/gofrs/uuid" -) - -func main() {}