From 5892e4f8b66d1546a91938c7cce450836cbfcf0d Mon Sep 17 00:00:00 2001 From: playHing Date: Sat, 22 Feb 2020 15:23:45 +0800 Subject: [PATCH 1/2] Get current file path --- epwing.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/epwing.go b/epwing.go index 98bfd87..1b96450 100644 --- a/epwing.go +++ b/epwing.go @@ -78,14 +78,17 @@ func epwingExportDb(inputPath, outputPath, language, title string, stride int, p var data []byte if toolExec { + ex, err := os.Executable() + if err != nil { + panic(err) + } + toolPath := filepath.Join("bin", runtime.GOOS, "zero-epwing") if runtime.GOOS == "windows" { toolPath += ".exe" } - if toolPath, err = filepath.Abs(toolPath); err != nil { - return err - } + toolPath = filepath.Join(filepath.Dir(ex), toolPath) if _, err = os.Stat(toolPath); err != nil { return fmt.Errorf("failed to find zero-epwing in '%s'", toolPath) From 0568b39d9108ced9a5537836f910d0f8531903d2 Mon Sep 17 00:00:00 2001 From: playHing Date: Fri, 6 Mar 2020 17:52:56 +0800 Subject: [PATCH 2/2] rename exePath var. return exepath err --- epwing.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epwing.go b/epwing.go index 1b96450..0647735 100644 --- a/epwing.go +++ b/epwing.go @@ -78,9 +78,9 @@ func epwingExportDb(inputPath, outputPath, language, title string, stride int, p var data []byte if toolExec { - ex, err := os.Executable() + exePath, err := os.Executable() if err != nil { - panic(err) + return err } toolPath := filepath.Join("bin", runtime.GOOS, "zero-epwing") @@ -88,7 +88,7 @@ func epwingExportDb(inputPath, outputPath, language, title string, stride int, p toolPath += ".exe" } - toolPath = filepath.Join(filepath.Dir(ex), toolPath) + toolPath = filepath.Join(filepath.Dir(exePath), toolPath) if _, err = os.Stat(toolPath); err != nil { return fmt.Errorf("failed to find zero-epwing in '%s'", toolPath)