Merge pull request #49 from vmarkovtsev/master

Update go.mod

Author: vmarkovtsev

.travis.yml

@@ -4,21 +4,20 @@ language: go
 
 go_import_path: gopkg.in/src-d/go-license-detector.v2
 go:
-  - 1.9.x
-  - 1.10.x
-  - tip
+  - 1.11.x
+  - 1.12.x
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - go: tip
 
 before_install:
   - go get -v golang.org/x/lint/golint
   - go get -v github.com/haya14busa/goverage
 
 install:
-  - go get -v -t ./...
+  - export GO111MODULE=on
+  - go mod vendor
+  - go build -v ./...
 
 script:
   - go vet ./...
@@ -34,29 +33,29 @@ jobs:
   include:
     - stage: deploy
       os: osx
-      go: 1.10.x
+      go: 1.12.x
       after_success:
-        - gzip -S .darwin_amd64.gz $GOPATH/bin/license-detector
+        - gzip -S .darwin_amd64.gz license-detector
       script: skip
       deploy:
         provider: releases
         api_key:
           secure: $GITHUB_TOKEN
-        file: "$GOPATH/bin/license-detector.darwin_amd64.gz"
+        file: "license-detector.darwin_amd64.gz"
         skip_cleanup: true
         on:
           tags: true
     - stage: deploy
       os: linux
-      go: 1.10.x
+      go: 1.12.x
       script: skip
       after_success:
-        - gzip -S .linux_amd64.gz $GOPATH/bin/license-detector
+        - gzip -S .linux_amd64.gz license-detector
       deploy:
         provider: releases
         api_key:
           secure: $GITHUB_TOKEN
-        file: "$GOPATH/bin/license-detector.linux_amd64.gz"
+        file: "license-detector.linux_amd64.gz"
         skip_cleanup: true
         on:
           tags: true

appveyor.yml

@@ -2,15 +2,14 @@ version: "{build}"
 platform: x64
 image: Visual Studio 2017
 
-clone_folder: c:\gopath\src\gopkg.in\src-d\go-license-detector.v2
-
 environment:
-  GOPATH: c:\gopath
+  GO111MODULE: on
 
 build_script:
-  - go version
-  - go get -v gopkg.in/src-d/go-license-detector.v2/cmd/license-detector
-  - 7z a c:\gopath\src\gopkg.in\src-d\go-license-detector.v2\license-detector.windows_amd64.zip %GOPATH%\bin\license-detector.exe
+  - go mod vendor
+  - go build -v gopkg.in/src-d/go-license-detector.v2/cmd/license-detector
+  - go test gopkg.in/src-d/go-license-detector.v2/...
+  - 7z a license-detector.windows_amd64.zip license-detector.exe
 
 artifacts:
   - name: license-detector.windows_amd64.zip

go.mod

@@ -15,13 +15,13 @@ require (
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jdkato/prose v1.1.0
 	github.com/kevinburke/ssh_config v0.0.0-20180127194858-0ff8514904a8 // indirect
-	github.com/kr/pretty v0.1.0 // indirect
 	github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747 // indirect
 	github.com/montanaflynn/stats v0.0.0-20151014174947-eeaced052adb // indirect
 	github.com/neurosnap/sentences v1.0.6 // indirect
 	github.com/pelletier/go-buffruneio v0.2.0 // indirect
 	github.com/pkg/errors v0.8.0
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/russross/blackfriday/v2 v2.0.1
 	github.com/sergi/go-diff v0.0.0-20180205163309-da645544ed44
 	github.com/shogo82148/go-shuffle v0.0.0-20170808115208-59829097ff3b // indirect
 	github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 // indirect
@@ -32,16 +32,13 @@ require (
 	golang.org/x/crypto v0.0.0-20180206190813-d9133f546934 // indirect
 	golang.org/x/exp v0.0.0-20171209012058-072991165226
 	golang.org/x/net v0.0.0-20180208041118-f5dfe339be1d
-	golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5 // indirect
 	golang.org/x/text v0.0.0-20180208041248-4e4a3210bb54
 	gonum.org/v1/gonum v0.0.0-20180205154402-996b88e8f894
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	gopkg.in/neurosnap/sentences.v1 v1.0.6 // indirect
-	gopkg.in/russross/blackfriday.v2 v2.0.0
-	gopkg.in/src-d/go-billy-siva.v4 v4.1.0
-	gopkg.in/src-d/go-billy.v4 v4.1.0
+	gopkg.in/src-d/go-billy-siva.v4 v4.3.0
+	gopkg.in/src-d/go-billy.v4 v4.3.0
 	gopkg.in/src-d/go-git-fixtures.v3 v3.3.0 // indirect
 	gopkg.in/src-d/go-git.v4 v4.1.0
-	gopkg.in/src-d/go-siva.v1 v1.1.3 // indirect
+	gopkg.in/src-d/go-siva.v1 v1.5.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )

go.sum

@@ -1,22 +1,15 @@
-github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc h1:8WFBn63wegobsYAX0YjD+8suexZDga5CctH4CCTx2+8=
 github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
 github.com/dgryski/go-minhash v0.0.0-20170608043002-7fe510aff544 h1:54Y/2GF52MSJ4n63HWvNDFRtztgm6tq2UrOX61sjGKc=
 github.com/dgryski/go-minhash v0.0.0-20170608043002-7fe510aff544/go.mod h1:VBi0XHpFy0xiMySf6YpVbRqrupW4RprJ5QTyN+XvGSM=
-github.com/dgryski/go-spooky v0.0.0-20170606183049-ed3d087f40e2 h1:lx1ZQgST/imDhmLpYDma1O3Cx9L+4Ie4E8S2RjFPQ30=
 github.com/dgryski/go-spooky v0.0.0-20170606183049-ed3d087f40e2/go.mod h1:hgHYKsoIw7S/hlWtP7wD1wZ7SX1jPTtKko5X9jrOgPQ=
 github.com/ekzhu/minhash-lsh v0.0.0-20171225071031-5c06ee8586a1 h1:/7G7q8SDJdrah5jDYqZI8pGFjSqiCzfSEO+NgqKCYX0=
 github.com/ekzhu/minhash-lsh v0.0.0-20171225071031-5c06ee8586a1/go.mod h1:yEtCVi+QamvzjEH4U/m6ZGkALIkF2xfQnFp0BcKmIOk=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/gliderlabs/ssh v0.1.1 h1:j3L6gSLQalDETeEg/Jg0mGY0/y/N6zI2xX1978P0Uqw=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/hhatto/gorst v0.0.0-20171128071645-7682c8a25108 h1:wWkhJ3fgjH1kk5Sp9mYd1puH4PVEU/k6GcpVp2LIUZw=
 github.com/hhatto/gorst v0.0.0-20171128071645-7682c8a25108/go.mod h1:HmaZGXHdSwQh1jnUlBGN2BeEYOHACLVGzYOXCbsLvxY=
@@ -26,23 +19,22 @@ github.com/jdkato/prose v1.1.0 h1:LpvmDGwbKGTgdCH3a8VJL56sr7p/wOFPw/R4lM4PfFg=
 github.com/jdkato/prose v1.1.0/go.mod h1:jkF0lkxaX5PFSlk9l4Gh9Y+T57TqUZziWT7uZbW5ADg=
 github.com/kevinburke/ssh_config v0.0.0-20180127194858-0ff8514904a8 h1:klRp3/4ivQOL3+RkXTG7Y0inb9Tw6FNsk6xGicemw98=
 github.com/kevinburke/ssh_config v0.0.0-20180127194858-0ff8514904a8/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747 h1:eQox4Rh4ewJF+mqYPxCkmBAirRnPaHEB26UkNuPyjlk=
 github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/montanaflynn/stats v0.0.0-20151014174947-eeaced052adb h1:bsjNADsjHq0gjU7KO7zwoX5k3HtFdf6TDzB3ncl5iUs=
 github.com/montanaflynn/stats v0.0.0-20151014174947-eeaced052adb/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
-github.com/neurosnap/sentences v1.0.6 h1:iBVUivNtlwGkYsJblWV8GGVFmXzZzak907Ci8aA0VTE=
 github.com/neurosnap/sentences v1.0.6/go.mod h1:pg1IapvYpWCJJm/Etxeh0+gtMf1rI1STY9S7eUCPbDc=
 github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA=
 github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
 github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sergi/go-diff v0.0.0-20180205163309-da645544ed44 h1:UoZTeCJuGZpwXXqamtSHypwjqpyGdR9smB5iMleBDJ8=
 github.com/sergi/go-diff v0.0.0-20180205163309-da645544ed44/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shogo82148/go-shuffle v0.0.0-20170808115208-59829097ff3b h1:VI1u+o2KZPZ5AhuPpXY0JBdpQPnkTx6Dd5XJhK/9MYE=
@@ -65,25 +57,29 @@ golang.org/x/net v0.0.0-20180208041118-f5dfe339be1d h1:lnO2rP1Eit1fCAJKjYJlnArsH
 golang.org/x/net v0.0.0-20180208041118-f5dfe339be1d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5 h1:MF92a0wJ3gzSUVBpjcwdrDr5+klMFRNEEu6Mev4n00I=
 golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9 h1:lkiLiLBHGoH3XnqSLUIaBsilGMUjI+Uy2Xu2JLUtTas=
+golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.0.0-20180208041248-4e4a3210bb54 h1:a5WocgxWTnjG0C4hZblDx+yonFbQMMbv8yJGhHMz/nY=
 golang.org/x/text v0.0.0-20180208041248-4e4a3210bb54/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gonum.org/v1/gonum v0.0.0-20180205154402-996b88e8f894 h1:7JhBunAsbjfnPGrLN5GFVAqcEs//9Bblx/Fosnaw/TY=
 gonum.org/v1/gonum v0.0.0-20180205154402-996b88e8f894/go.mod h1:cucAdkem48eM79EG1fdGOGASXorNZIYAO9duTse+1cI=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/neurosnap/sentences.v1 v1.0.6 h1:v7ElyP020iEZQONyLld3fHILHWOPs+ntzuQTNPkul8E=
 gopkg.in/neurosnap/sentences.v1 v1.0.6/go.mod h1:YlK+SN+fLQZj+kY3r8DkGDhDr91+S3JmTb5LSxFRQo0=
-gopkg.in/russross/blackfriday.v2 v2.0.0 h1:+FlnIV8DSQnT7NZ43hcVKcdJdzZoeCmJj4Ql8gq5keA=
-gopkg.in/russross/blackfriday.v2 v2.0.0/go.mod h1:6sSBNz/GtOm/pJTuh5UmBK2ZHfmnxGbl2NZg1UliSOI=
 gopkg.in/src-d/go-billy-siva.v4 v4.1.0 h1:m3SYGYbM7LfWUfTE232ZaTAkd0jWwPTWuEnFFO7NvZc=
 gopkg.in/src-d/go-billy-siva.v4 v4.1.0/go.mod h1:4wKeCzOCSsdyFeM5+58M6ObU6FM+lZT12p7zm7A+9n0=
+gopkg.in/src-d/go-billy-siva.v4 v4.3.0 h1:bin2telR2qmBfHfTb61SboE4M1LjofSN0g6vn4Tmdck=
+gopkg.in/src-d/go-billy-siva.v4 v4.3.0/go.mod h1:4wKeCzOCSsdyFeM5+58M6ObU6FM+lZT12p7zm7A+9n0=
 gopkg.in/src-d/go-billy.v4 v4.1.0 h1:1kSGpGfLygUB824Wk+fWf2fci5k9gNAQS/J8zZyOO0I=
 gopkg.in/src-d/go-billy.v4 v4.1.0/go.mod h1:ZHSF0JP+7oD97194otDUCD7Ofbk63+xFcfWP5bT6h+Q=
-gopkg.in/src-d/go-git-fixtures.v3 v3.3.0 h1:AxUOwLW3at53ysFqs0Lg+H+8KSQXl7AEHBvWj8wEsT8=
+gopkg.in/src-d/go-billy.v4 v4.3.0 h1:KtlZ4c1OWbIs4jCv5ZXrTqG8EQocr0g/d4DjNg70aek=
+gopkg.in/src-d/go-billy.v4 v4.3.0/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk=
 gopkg.in/src-d/go-git-fixtures.v3 v3.3.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
 gopkg.in/src-d/go-git.v4 v4.1.0 h1:ca/w7I2ziAYUrqcyq0Sm065FS1EUQKlzDCm09/RaF0o=
 gopkg.in/src-d/go-git.v4 v4.1.0/go.mod h1:CzbUWqMn4pvmvndg3gnh5iZFmSsbhyhUWdI0IQ60AQo=
 gopkg.in/src-d/go-siva.v1 v1.1.3 h1:XIb8RKaiHzCbezoJN9t6hIzrWGGXj0Hx7OGtWj9MkOc=
 gopkg.in/src-d/go-siva.v1 v1.1.3/go.mod h1:tk1jnIXawd/PTlRNWdr5V5lC0PttNJmu1fv7wt7IZlw=
+gopkg.in/src-d/go-siva.v1 v1.5.0 h1:WowvbZTlz0SPoV7WNCGktPSi2yRK78HPyXl7wYqDeHE=
+gopkg.in/src-d/go-siva.v1 v1.5.0/go.mod h1:tk1jnIXawd/PTlRNWdr5V5lC0PttNJmu1fv7wt7IZlw=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=

licensedb/filer/filer.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"io/ioutil"
 	"os"
+	xpath "path"
 	"path/filepath"
 	"strings"
 
@@ -36,6 +37,9 @@ type Filer interface {
 	ReadDir(path string) ([]File, error)
 	// Close frees all the resources allocated by this Filer.
 	Close()
+	// PathsAreAlwaysSlash indicates whether the path separator is platform-independent ("/") or
+	// OS-specific.
+	PathsAreAlwaysSlash() bool
 }
 
 type localFiler struct {
@@ -99,6 +103,10 @@ func (filer *localFiler) ReadDir(path string) ([]File, error) {
 
 func (filer *localFiler) Close() {}
 
+func (filer *localFiler) PathsAreAlwaysSlash() bool {
+	return false
+}
+
 type gitFiler struct {
 	root *object.Tree
 }
@@ -199,6 +207,10 @@ func (filer *gitFiler) Close() {
 	filer.root = nil
 }
 
+func (filer *gitFiler) PathsAreAlwaysSlash() bool {
+	return true
+}
+
 // FromSiva returns a Filer that allows accessing all the files in a Git repository contained in a Siva file.
 // See https://github.com/src-d/go-siva and https://github.com/src-d/go-billy-siva
 func FromSiva(path string) (Filer, error) {
@@ -222,13 +234,16 @@ func FromSiva(path string) (Filer, error) {
 		return nil, errors.Wrapf(err, "unable to list Git references from Siva file %s", path)
 	}
 	var head plumbing.ReferenceName
-	refs.ForEach(func(ref *plumbing.Reference) error {
+	err = refs.ForEach(func(ref *plumbing.Reference) error {
 		if strings.HasPrefix(ref.Name().String(), "refs/heads/HEAD/") {
 			head = ref.Name()
 			return storer.ErrStop
 		}
 		return nil
 	})
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to iterate over references in Siva file %s", path)
+	}
 	return fromGit(repo, head)
 }
 
@@ -269,7 +284,7 @@ func FromZIP(path string) (Filer, error) {
 }
 
 func (filer *zipFiler) ReadFile(path string) ([]byte, error) {
-	parts := strings.Split(path, string(filepath.Separator))
+	parts := strings.Split(path, string("/"))
 	node := filer.tree
 	for _, part := range parts {
 		if part == "" {
@@ -293,7 +308,7 @@ func (filer *zipFiler) ReadFile(path string) ([]byte, error) {
 }
 
 func (filer *zipFiler) ReadDir(path string) ([]File, error) {
-	parts := strings.Split(path, string(filepath.Separator))
+	parts := strings.Split(path, string("/"))
 	node := filer.tree
 	for _, part := range parts {
 		if part == "" {
@@ -321,6 +336,10 @@ func (filer *zipFiler) Close() {
 	filer.arch.Close()
 }
 
+func (filer *zipFiler) PathsAreAlwaysSlash() bool {
+	return true
+}
+
 type nestedFiler struct {
 	origin Filer
 	offset string
@@ -332,13 +351,29 @@ func NestFiler(filer Filer, prefix string) Filer {
 }
 
 func (filer *nestedFiler) ReadFile(path string) ([]byte, error) {
-	return filer.origin.ReadFile(filepath.Join(filer.offset, path))
+	var fullPath string
+	if filer.origin.PathsAreAlwaysSlash() {
+		fullPath = xpath.Join(filer.offset, path)
+	} else {
+		fullPath = filepath.Join(filer.offset, path)
+	}
+	return filer.origin.ReadFile(fullPath)
 }
 
 func (filer *nestedFiler) ReadDir(path string) ([]File, error) {
-	return filer.origin.ReadDir(filepath.Join(filer.offset, path))
+	var fullPath string
+	if filer.origin.PathsAreAlwaysSlash() {
+		fullPath = xpath.Join(filer.offset, path)
+	} else {
+		fullPath = filepath.Join(filer.offset, path)
+	}
+	return filer.origin.ReadDir(fullPath)
 }
 
 func (filer *nestedFiler) Close() {
 	filer.origin.Close()
 }
+
+func (filer *nestedFiler) PathsAreAlwaysSlash() bool {
+	return filer.origin.PathsAreAlwaysSlash()
+}

licensedb/internal/processors/markup.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 
 	"github.com/hhatto/gorst"
-	"gopkg.in/russross/blackfriday.v2"
+	"github.com/russross/blackfriday/v2"
 )
 
 // Markdown converts Markdown to plain text. It tries to revert all the decorations.