changed old manifest.toml to Packet.lua and some improvements for future 100% Packet.lua implementation
This commit is contained in:
@@ -3,6 +3,7 @@ package main
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -13,11 +14,13 @@ import (
|
||||
"packets/configs"
|
||||
"packets/internal/consts"
|
||||
errors_packets "packets/internal/errors"
|
||||
"packets/internal/packet"
|
||||
"packets/internal/utils"
|
||||
packets "packets/pkg"
|
||||
|
||||
"github.com/pelletier/go-toml/v2"
|
||||
"github.com/spf13/cobra"
|
||||
lua "github.com/yuin/gopher-lua"
|
||||
_ "modernc.org/sqlite"
|
||||
)
|
||||
|
||||
@@ -360,18 +363,25 @@ var removeCmd = &cobra.Command{
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
f, err := os.Open(filepath.Join(packageDir, "manifest.toml"))
|
||||
f, err := os.Open(filepath.Join(packageDir, "Packet.lua"))
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
manifest, err := utils.ManifestFileRead(f)
|
||||
fBLob, err := io.ReadAll(f)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
manifest, err := packet.ReadPacket(fBLob)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
fmt.Println(":: Removing", pkgName)
|
||||
|
||||
packets.ExecuteRemoveScript(filepath.Join(packageDir, manifest.Hooks.Remove))
|
||||
if err := manifest.ExecuteRemove(lua.NewState()); err != nil {
|
||||
log.Panic(err)
|
||||
}
|
||||
|
||||
if err := os.RemoveAll(packageDir); err != nil {
|
||||
log.Fatal(err)
|
||||
@@ -647,7 +657,7 @@ func UpgradeToThis(id string, installPath string, installedDB *sql.DB, storePkgF
|
||||
serial = ?, package_d = ?, filename = ?, os = ?, arch = ?, in_cache = ?
|
||||
`,
|
||||
p.QueryName,
|
||||
p.Manifest.Package.Id,
|
||||
p.Manifest.Id,
|
||||
p.Version,
|
||||
p.Description,
|
||||
p.Serial,
|
||||
|
||||
Reference in New Issue
Block a user