From f4f793123bdb949ae6d994142182ce6f150a8552 Mon Sep 17 00:00:00 2001 From: tjmtmmnk Date: Fri, 26 Feb 2021 19:03:26 +0900 Subject: [PATCH] home dir util --- config.go | 10 +--------- util/logger.go | 1 - util/util.go | 6 ++++++ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/config.go b/config.go index 040c07d..21ea3d6 100644 --- a/config.go +++ b/config.go @@ -1,9 +1,6 @@ package ilse import ( - "fmt" - "os" - "github.com/tjmtmmnk/ilse/util" ) @@ -22,12 +19,7 @@ func NewConfig() (*Config, error) { if err != nil { return nil, err } - - userHomeDir, err := os.UserHomeDir() - if err != nil { - return nil, err - } - homeDir := fmt.Sprintf("%s/.ilse", userHomeDir) + homeDir := util.GetHomeDir() return &Config{ Theme: "OneHalfDark", diff --git a/util/logger.go b/util/logger.go index 1db712d..444c43b 100644 --- a/util/logger.go +++ b/util/logger.go @@ -30,7 +30,6 @@ var Logger = newLogger() func newLogger() *logger { path := fmt.Sprintf("%s/log.txt", GetHomeDir()) - log.Println(path) file, _ := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0664) l := log.New(file, "", log.Ldate|log.Ltime|log.Lshortfile) diff --git a/util/util.go b/util/util.go index f3a403c..83125ce 100644 --- a/util/util.go +++ b/util/util.go @@ -20,6 +20,12 @@ func ShortFileName(fileName string) string { } } +func GetHomeDir() string { + userHomeDir, _ := os.UserHomeDir() + homeDir := fmt.Sprintf("%s/.ilse", userHomeDir) + return homeDir +} + // if use git, return repository // else return current directory func GetUserWorkDir() (string, error) {