Library v2

matbme · matbme · commit 41eb2722999f · 2023-12-16T14:28:45.000-03:00
diff --git a/cmd/pkgManagers.go b/cmd/pkgManagers.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/vanilla-os/apx/core"
+	"github.com/vanilla-os/apx/v2/core"
 	"github.com/vanilla-os/orchid/cmdr"
 )
 
diff --git a/cmd/runtime.go b/cmd/runtime.go
@@ -12,7 +12,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"github.com/vanilla-os/apx/core"
+	"github.com/vanilla-os/apx/v2/core"
 	"github.com/vanilla-os/orchid/cmdr"
 )
 
diff --git a/cmd/stacks.go b/cmd/stacks.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/vanilla-os/apx/core"
+	"github.com/vanilla-os/apx/v2/core"
 	"github.com/vanilla-os/orchid/cmdr"
 )
 
diff --git a/cmd/subsyStems.go b/cmd/subsyStems.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/vanilla-os/apx/core"
+	"github.com/vanilla-os/apx/v2/core"
 	"github.com/vanilla-os/orchid/cmdr"
 )
 
diff --git a/core/apx.go b/core/apx.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	"github.com/vanilla-os/apx/settings"
+	"github.com/vanilla-os/apx/v2/settings"
 )
 
 var apx *Apx
diff --git a/core/pkgManager.go b/core/pkgManager.go
@@ -11,7 +11,7 @@ package core
 
 import (
 	"errors"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 
@@ -72,7 +72,7 @@ func loadPkgManagerFromPath(path string) (*PkgManager, error) {
 		return nil, errors.New("package manager not found")
 	}
 
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		return nil, err
 	}
@@ -93,7 +93,7 @@ func (pkgManager *PkgManager) Save() error {
 	}
 
 	filePath := filepath.Join(apx.Cnf.UserPkgManagersPath, pkgManager.Name+".yaml")
-	err = ioutil.WriteFile(filePath, data, 0644)
+	err = os.WriteFile(filePath, data, 0644)
 	return err
 }
 
@@ -145,7 +145,7 @@ func ListPkgManagers() []*PkgManager {
 func listPkgManagersFromPath(path string) []*PkgManager {
 	pkgManagers := make([]*PkgManager, 0)
 
-	files, err := ioutil.ReadDir(path)
+	files, err := os.ReadDir(path)
 	if err != nil {
 		return pkgManagers
 	}
diff --git a/core/stack.go b/core/stack.go
@@ -11,7 +11,7 @@ package core
 
 import (
 	"errors"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 
@@ -56,7 +56,7 @@ func LoadStackFromPath(path string) (*Stack, error) {
 		return nil, errors.New("stack not found")
 	}
 
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		return nil, err
 	}
@@ -77,7 +77,7 @@ func (stack *Stack) Save() error {
 	}
 
 	filePath := filepath.Join(apx.Cnf.UserStacksPath, stack.Name+".yaml")
-	err = ioutil.WriteFile(filePath, data, 0644)
+	err = os.WriteFile(filePath, data, 0644)
 	return err
 }
 
@@ -117,7 +117,7 @@ func (stack *Stack) Export(path string) error {
 		return err
 	}
 
-	err = ioutil.WriteFile(filePath, data, 0644)
+	err = os.WriteFile(filePath, data, 0644)
 	if err != nil {
 		return err
 	}
@@ -170,7 +170,7 @@ func ListStackForPkgManager(pkgManager string) []*Stack {
 func listStacksFromPath(path string) []*Stack {
 	stacks := make([]*Stack, 0)
 
-	files, err := ioutil.ReadDir(path)
+	files, err := os.ReadDir(path)
 	if err != nil {
 		return stacks
 	}
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/vanilla-os/apx
+module github.com/vanilla-os/apx/v2
 
 go 1.18
 
diff --git a/main.go b/main.go
@@ -12,8 +12,8 @@ import (
 	"embed"
 	"os"
 
-	"github.com/vanilla-os/apx/cmd"
-	"github.com/vanilla-os/apx/core"
+	"github.com/vanilla-os/apx/v2/cmd"
+	"github.com/vanilla-os/apx/v2/core"
 	"github.com/vanilla-os/orchid/cmdr"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`
`18`	`18`	`"github.com/spf13/cobra"`
`19`	`19`
`20`		`- "github.com/vanilla-os/apx/core"`
	`20`	`+ "github.com/vanilla-os/apx/v2/core"`
`21`	`21`	`"github.com/vanilla-os/orchid/cmdr"`
`22`	`22`	`)`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"fmt"`
`13`	`13`
`14`	`14`	`"github.com/spf13/cobra"`
`15`		`- "github.com/vanilla-os/apx/core"`
	`15`	`+ "github.com/vanilla-os/apx/v2/core"`
`16`	`16`	`"github.com/vanilla-os/orchid/cmdr"`
`17`	`17`	`)`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`
`17`	`17`	`"github.com/spf13/cobra"`
`18`	`18`
`19`		`- "github.com/vanilla-os/apx/core"`
	`19`	`+ "github.com/vanilla-os/apx/v2/core"`
`20`	`20`	`"github.com/vanilla-os/orchid/cmdr"`
`21`	`21`	`)`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package core`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/vanilla-os/apx/settings"`
	`4`	`+ "github.com/vanilla-os/apx/v2/settings"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`var apx *Apx`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ package core`
`11`	`11`
`12`	`12`	`import (`
`13`	`13`	`"errors"`
`14`		`- "io/ioutil"`
	`14`	`+ "io"`
`15`	`15`	`"os"`
`16`	`16`	`"path/filepath"`
`17`	`17`
`@@ -72,7 +72,7 @@ func loadPkgManagerFromPath(path string) (*PkgManager, error) {`
`72`	`72`	`return nil, errors.New("package manager not found")`
`73`	`73`	`}`
`74`	`74`
`75`		`- data, err := ioutil.ReadAll(f)`
	`75`	`+ data, err := io.ReadAll(f)`
`76`	`76`	`if err != nil {`
`77`	`77`	`return nil, err`
`78`	`78`	`}`
`@@ -93,7 +93,7 @@ func (pkgManager *PkgManager) Save() error {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`filePath := filepath.Join(apx.Cnf.UserPkgManagersPath, pkgManager.Name+".yaml")`
`96`		`- err = ioutil.WriteFile(filePath, data, 0644)`
	`96`	`+ err = os.WriteFile(filePath, data, 0644)`
`97`	`97`	`return err`
`98`	`98`	`}`
`99`	`99`
`@@ -145,7 +145,7 @@ func ListPkgManagers() []*PkgManager {`
`145`	`145`	`func listPkgManagersFromPath(path string) []*PkgManager {`
`146`	`146`	`pkgManagers := make([]*PkgManager, 0)`
`147`	`147`
`148`		`- files, err := ioutil.ReadDir(path)`
	`148`	`+ files, err := os.ReadDir(path)`
`149`	`149`	`if err != nil {`
`150`	`150`	`return pkgManagers`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/vanilla-os/apx`
	`1`	`+module github.com/vanilla-os/apx/v2`
`2`	`2`
`3`	`3`	`go 1.18`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ import (`
`12`	`12`	`"embed"`
`13`	`13`	`"os"`
`14`	`14`
`15`		`- "github.com/vanilla-os/apx/cmd"`
`16`		`- "github.com/vanilla-os/apx/core"`
	`15`	`+ "github.com/vanilla-os/apx/v2/cmd"`
	`16`	`+ "github.com/vanilla-os/apx/v2/core"`
`17`	`17`	`"github.com/vanilla-os/orchid/cmdr"`
`18`	`18`	`)`
`19`	`19`