Fix licenses.go

goark · Mar 25, 2021 · ae1b4aa · ae1b4aa
1 parent ec18f1b
commit ae1b4aa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -18,6 +18,8 @@ builds:
   - arm
   - arm64
   main: ./
+  flags:
+  - -trimpath
   ldflags: -s -w -X github.com/spiegel-im-spiegel/depm/facade.Version=v{{ .Version }}
   binary: depm
 

diff --git a/modules/licenses.go b/modules/licenses.go
@@ -6,6 +6,7 @@ import (
 	"regexp"
 
 	"github.com/google/licenseclassifier"
+	"github.com/google/licenseclassifier/stringclassifier"
 )
 
 var (
@@ -26,7 +27,14 @@ func FindLicense(dir string) string {
 		if licenseRegexp.MatchString(f.Name()) {
 			path := filepath.Join(dir, f.Name())
 			if content, err := os.ReadFile(path); err == nil {
-				matches := classifier.MultipleMatch(string(content), true)
+				matches := func() stringclassifier.Matches {
+					defer func() {
+						if r := recover(); r != nil {
+							return
+						}
+					}()
+					return classifier.MultipleMatch(string(content), true)
+				}()
 				if len(matches) > 0 {
 					return matches[0].Name
 				}