From d68cdc672e64aa08a9d75babfa477dcede2669d4 Mon Sep 17 00:00:00 2001 From: John Thornton Date: Sun, 25 Oct 2015 12:51:08 -0500 Subject: [PATCH] look for ini file in current working directory Signed-off-by: John Thornton --- dxf2gcode.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dxf2gcode.go b/dxf2gcode.go index 6eb7ae6..6236580 100644 --- a/dxf2gcode.go +++ b/dxf2gcode.go @@ -9,7 +9,8 @@ import ( ) func main() { - usr, _ := user.Current() + usr, _ := user.Current() // get user information + cwd, _ := os.Getwd() // get current working directory iniMap := make(map[string]string) var inFile string if len(os.Args) == 2 { @@ -21,14 +22,13 @@ func main() { inFile = os.Args[1] } } else { - pwd, _ := os.Getwd() - fmt.Println("Current Working Directory is:", pwd) + fmt.Println("Current Working Directory is:", cwd) fmt.Println("Current User Directory is:", usr.HomeDir) fmt.Println("Usage is: dxf2gcode filename.ext") fmt.Println("Usage is: dxf2gcode -v") os.Exit(0) } - dxfutil.Readini(iniMap, usr.HomeDir) + dxfutil.Readini(iniMap, cwd) lines := dxfutil.GetLines(inFile) entities := dxfutil.GetEntities(lines) entities = dxfutil.GetEndPoints(entities)