all: replace ioutil.ReadFile with os.ReadFile

The ioutil.ReadFile has been deprecated since 1.16.

2 files changed, 20 insertions, 10 deletions

diff --git a/script.go b/script.go
index 4d887b9..7a184e6 100644
--- a/script.go
+++ b/script.go
@@ -6,7 +6,6 @@ package awwan
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"text/template"
 )
@@ -26,9 +25,12 @@ type Script struct {
 // split it into Statements.
 //
 func NewScriptForLocal(ses *Session, path string) (script *Script, err error) {
-	logp := "NewScriptForLocal"
+	var (
+		logp    = "NewScriptForLocal"
+		content []byte
+	)
 
-	content, err := ioutil.ReadFile(path)
+	content, err = os.ReadFile(path)
 	if err != nil {
 		return nil, fmt.Errorf("%s: %w", logp, err)
 	}
@@ -46,9 +48,12 @@ func NewScriptForLocal(ses *Session, path string) (script *Script, err error) {
 // Statements.
 //
 func NewScriptForRemote(ses *Session, path string) (script *Script, err error) {
-	logp := "NewScriptForRemote"
+	var (
+		logp    = "NewScriptForRemote"
+		content []byte
+	)
 
-	content, err := ioutil.ReadFile(path)
+	content, err = os.ReadFile(path)
 	if err != nil {
 		return nil, fmt.Errorf("%s: %w", logp, err)
 	}
diff --git a/session.go b/session.go
index ef2254e..562e337 100644
--- a/session.go
+++ b/session.go
@@ -5,7 +5,6 @@ package awwan
 
 import (
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"os/exec"
@@ -493,12 +492,18 @@ func (ses *Session) initSSHClient(req *Request, sshSection *config.Section) (err
 // loadEnvFromPaths load environment file from each directory in paths.
 //
 func (ses *Session) loadEnvFromPaths() (err error) {
-	logp := "loadEnvFromPaths"
+	var (
+		logp = "loadEnvFromPaths"
+
+		path     string
+		awwanEnv string
+		content  []byte
+	)
 
-	for _, path := range ses.paths {
-		awwanEnv := filepath.Join(path, defEnvFileName)
+	for _, path = range ses.paths {
+		awwanEnv = filepath.Join(path, defEnvFileName)
 
-		content, err := ioutil.ReadFile(awwanEnv)
+		content, err = os.ReadFile(awwanEnv)
 		if err != nil {
 			if os.IsNotExist(err) {
 				continue