From 976ae0503e644ddb87364431bc383e3abca43973 Mon Sep 17 00:00:00 2001 From: tenntenn Date: Thu, 9 Jun 2022 17:10:23 +0900 Subject: [PATCH 1/2] Update version to v2.2.2 --- v2/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2/version.txt b/v2/version.txt index 7fe52d3..6c8b2a3 100644 --- a/v2/version.txt +++ b/v2/version.txt @@ -1 +1 @@ -v2.2.1 +v2.2.2 From 00a48d90b9b7095524bffd38d370b697ae08dc4a Mon Sep 17 00:00:00 2001 From: tenntenn Date: Thu, 9 Jun 2022 17:25:28 +0900 Subject: [PATCH 2/2] Fix for rel path --- v2/skeleton/skeleton.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/v2/skeleton/skeleton.go b/v2/skeleton/skeleton.go index d80a3e0..a3d3d6c 100644 --- a/v2/skeleton/skeleton.go +++ b/v2/skeleton/skeleton.go @@ -164,11 +164,21 @@ func (s *Skeleton) withoutGoMod(p string) (string, error) { return "", err } + wd, err = filepath.Abs(wd) + if err != nil { + return "", err + } + moddir, err = filepath.EvalSymlinks(moddir) if err != nil { return "", err } + moddir, err = filepath.Abs(moddir) + if err != nil { + return "", err + } + rel, err := filepath.Rel(moddir, wd) if err != nil { return "", err