55package mage
66
77import (
8+ "fmt"
89 "io"
9- "io/ioutil "
10+ "io/fs "
1011 "os"
1112 "path/filepath"
1213 "regexp"
@@ -41,7 +42,7 @@ func (t *CopyTask) Execute() error {
4142 return errors .Wrapf (err , "copy failed: cannot stat source file %v" , t .Source )
4243 }
4344
44- return errors .Wrap (t .recursiveCopy (t .Source , t .Dest , info ), "copy failed" )
45+ return errors .Wrap (t .recursiveCopy (t .Source , t .Dest , fs . FileInfoToDirEntry ( info ) ), "copy failed" )
4546}
4647
4748func (t * CopyTask ) init () error {
@@ -64,14 +65,14 @@ func (t *CopyTask) isExcluded(src string) bool {
6465 return false
6566}
6667
67- func (t * CopyTask ) recursiveCopy (src , dest string , info os. FileInfo ) error {
68- if info .IsDir () {
69- return t .dirCopy (src , dest , info )
68+ func (t * CopyTask ) recursiveCopy (src , dest string , entry fs. DirEntry ) error {
69+ if entry .IsDir () {
70+ return t .dirCopy (src , dest , entry )
7071 }
71- return t .fileCopy (src , dest , info )
72+ return t .fileCopy (src , dest , entry )
7273}
7374
74- func (t * CopyTask ) fileCopy (src , dest string , info os. FileInfo ) error {
75+ func (t * CopyTask ) fileCopy (src , dest string , entry fs. DirEntry ) error {
7576 if t .isExcluded (src ) {
7677 return nil
7778 }
@@ -82,6 +83,11 @@ func (t *CopyTask) fileCopy(src, dest string, info os.FileInfo) error {
8283 }
8384 defer srcFile .Close ()
8485
86+ info , err := entry .Info ()
87+ if err != nil {
88+ return fmt .Errorf ("converting dir entry: %w" , err )
89+ }
90+
8591 if ! info .Mode ().IsRegular () {
8692 return errors .Errorf ("failed to copy source file because it is not a " +
8793 "regular file" )
@@ -104,28 +110,34 @@ func (t *CopyTask) fileCopy(src, dest string, info os.FileInfo) error {
104110 return destFile .Close ()
105111}
106112
107- func (t * CopyTask ) dirCopy (src , dest string , info os. FileInfo ) error {
113+ func (t * CopyTask ) dirCopy (src , dest string , entry fs. DirEntry ) error {
108114 if t .isExcluded (src ) {
109115 return nil
110116 }
111117
118+ info , err := entry .Info ()
119+ if err != nil {
120+ return fmt .Errorf ("converting dir entry: %w" , err )
121+ }
122+
112123 mode := t .DirMode
113124 if mode == 0 {
114125 mode = info .Mode ()
115126 }
127+
116128 if err := os .MkdirAll (dest , mode & os .ModePerm ); err != nil {
117129 return errors .Wrap (err , "failed creating dirs" )
118130 }
119131
120- contents , err := ioutil .ReadDir (src )
132+ contents , err := os .ReadDir (src )
121133 if err != nil {
122134 return errors .Wrapf (err , "failed to read dir %v" , src )
123135 }
124136
125- for _ , info := range contents {
137+ for _ , entry := range contents {
126138 srcFile := filepath .Join (src , info .Name ())
127139 destFile := filepath .Join (dest , info .Name ())
128- if err = t .recursiveCopy (srcFile , destFile , info ); err != nil {
140+ if err = t .recursiveCopy (srcFile , destFile , entry ); err != nil {
129141 return errors .Wrapf (err , "failed to copy %v to %v" , srcFile , destFile )
130142 }
131143 }
0 commit comments