|
@@ -9,7 +9,6 @@ import (
|
|
"context"
|
|
"context"
|
|
"encoding/json"
|
|
"encoding/json"
|
|
"fmt"
|
|
"fmt"
|
|
- "io/ioutil"
|
|
|
|
"log"
|
|
"log"
|
|
"os"
|
|
"os"
|
|
"path"
|
|
"path"
|
|
@@ -1109,7 +1108,7 @@ func (state *golistState) writeOverlays() (filename string, cleanup func(), err
|
|
if len(state.cfg.Overlay) == 0 {
|
|
if len(state.cfg.Overlay) == 0 {
|
|
return "", func() {}, nil
|
|
return "", func() {}, nil
|
|
}
|
|
}
|
|
- dir, err := ioutil.TempDir("", "gopackages-*")
|
|
|
|
|
|
+ dir, err := os.MkdirTemp("", "gopackages-*")
|
|
if err != nil {
|
|
if err != nil {
|
|
return "", nil, err
|
|
return "", nil, err
|
|
}
|
|
}
|
|
@@ -1128,7 +1127,7 @@ func (state *golistState) writeOverlays() (filename string, cleanup func(), err
|
|
// Create a unique filename for the overlaid files, to avoid
|
|
// Create a unique filename for the overlaid files, to avoid
|
|
// creating nested directories.
|
|
// creating nested directories.
|
|
noSeparator := strings.Join(strings.Split(filepath.ToSlash(k), "/"), "")
|
|
noSeparator := strings.Join(strings.Split(filepath.ToSlash(k), "/"), "")
|
|
- f, err := ioutil.TempFile(dir, fmt.Sprintf("*-%s", noSeparator))
|
|
|
|
|
|
+ f, err := os.CreateTemp(dir, fmt.Sprintf("*-%s", noSeparator))
|
|
if err != nil {
|
|
if err != nil {
|
|
return "", func() {}, err
|
|
return "", func() {}, err
|
|
}
|
|
}
|
|
@@ -1146,7 +1145,7 @@ func (state *golistState) writeOverlays() (filename string, cleanup func(), err
|
|
}
|
|
}
|
|
// Write out the overlay file that contains the filepath mappings.
|
|
// Write out the overlay file that contains the filepath mappings.
|
|
filename = filepath.Join(dir, "overlay.json")
|
|
filename = filepath.Join(dir, "overlay.json")
|
|
- if err := ioutil.WriteFile(filename, b, 0665); err != nil {
|
|
|
|
|
|
+ if err := os.WriteFile(filename, b, 0665); err != nil {
|
|
return "", func() {}, err
|
|
return "", func() {}, err
|
|
}
|
|
}
|
|
return filename, cleanup, nil
|
|
return filename, cleanup, nil
|