File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ func (c hash) Exec() error {
1515 if err != nil {
1616 return err
1717 }
18- hf , err := hashutil .HashFromFileName (c .Source , h )
18+ hf , err := h .HashFromFileName (c .Source )
1919 if err != nil {
2020 return err
2121 }
Original file line number Diff line number Diff line change 11package command
22
33import (
4- stdhash "hash"
54 "os"
65
76 "github.com/no-src/gofs/util/hashutil"
@@ -41,11 +40,10 @@ func (c isEqual) Exec() error {
4140 if ! c .Expect && ! actual {
4241 return nil
4342 }
44- srcHash , err := hashutil .HashFromFileName (c .Source , h )
43+ srcHash , err := h .HashFromFileName (c .Source )
4544 if err == nil {
46- h .Reset ()
4745 var dstHash string
48- dstHash , err = hashutil .HashFromFileName (c .Dest , h )
46+ dstHash , err = h .HashFromFileName (c .Dest )
4947 if err == nil {
5048 actual = srcHash == dstHash
5149 if actual != c .Expect {
@@ -60,7 +58,7 @@ func (c isEqual) Name() string {
6058 return "is-equal"
6159}
6260
63- func (c isEqual ) newHash () (stdhash .Hash , error ) {
61+ func (c isEqual ) newHash () (hashutil .Hash , error ) {
6462 algorithm := c .Algorithm
6563 if len (algorithm ) == 0 {
6664 algorithm = hashutil .MD5Hash
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ module github.com/no-src/fsctl
33go 1.19
44
55require (
6- github.com/no-src/gofs v0.6.0
6+ github.com/no-src/gofs v0.6.1-0.20230328151824-2d91857cadde
77 github.com/no-src/log v0.1.10
88 gopkg.in/yaml.v3 v3.0.1
99)
Original file line number Diff line number Diff line change @@ -7,8 +7,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
77github.com/kr/text v0.1.0 /go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI =
88github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY =
99github.com/kr/text v0.2.0 /go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE =
10- github.com/no-src/gofs v0.6.0 h1:xvmdJN2bOvpsYaqZibiTEHMFqgbFOXb/iCvD218vkJE =
11- github.com/no-src/gofs v0.6.0 /go.mod h1:VttlLNOBntjsrQfl2ENUdLaZxGRU+LLwJ3WrDqSgaEM =
10+ github.com/no-src/gofs v0.6.1-0.20230328151824-2d91857cadde h1:1pNsclqTxMkLL+Zf8ukbN15/JKC7lFjkZrsD4xdFarY =
11+ github.com/no-src/gofs v0.6.1-0.20230328151824-2d91857cadde /go.mod h1:5JeDc7ywvEy80HMpUvxNtoERTEf8Vp/29nDCWTUlJnk =
1212github.com/no-src/log v0.1.10 h1:Cffl4xILkfqZD8OxTrEjpjdDMt2jaGe4dMn707CdxoY =
1313github.com/no-src/log v0.1.10 /go.mod h1:C58ahv0WdsBL3Yxi+v6wyUXzwqk7aEPN+/1ltOsdHXg =
1414github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e /go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA =
You can’t perform that action at this time.
0 commit comments