general-packages/pikman
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up logic and dedup it around the init

Browse Source
This commit is contained in:
ferrreo 2023-08-22 17:57:19 +01:00
parent c8711cf1fa
commit 1a467b9684
1 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
command/command.go
View File

@ -1,13 +1,11 @@
package command package command
import ( import (
"encoding/json"
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
"log"
"bytes"
"regexp"
"pikman/alpine" "pikman/alpine"
"pikman/arch" "pikman/arch"
@ -36,24 +34,24 @@ var packageManagerMap = map[types.OSType]string{
types.Flatpak: flatpak.PackageManager, types.Flatpak: flatpak.PackageManager,
} }
var containerSubsystemMap = map[types.OSType]string{ var containerSubsystemMap = map[types.OSType]string{
types.Arch: arch.ContainerSubsystem, types.Arch: arch.ContainerSubsystem,
types.Fedora: fedora.ContainerSubsystem, types.Fedora: fedora.ContainerSubsystem,
types.Alpine: alpine.ContainerSubsystem, types.Alpine: alpine.ContainerSubsystem,
} }
func (c *Command) ContainerSubsystem() string { func (c *Command) ContainerSubsystem() string {
return containerSubsystemMap[c.OsType] return containerSubsystemMap[c.OsType]
} }
var apxSubsystemMap = map[types.OSType]string{ var apxSubsystemMap = map[types.OSType]string{
types.Arch: arch.ApxSubsystem, types.Arch: arch.ApxSubsystem,
types.Fedora: fedora.ApxSubsystem, types.Fedora: fedora.ApxSubsystem,
types.Alpine: alpine.ApxSubsystem, types.Alpine: alpine.ApxSubsystem,
} }
func (c *Command) ApxSubsystem() string { func (c *Command) ApxSubsystem() string {
return apxSubsystemMap[c.OsType] return apxSubsystemMap[c.OsType]
} }
type Command struct { type Command struct {
@ -78,53 +76,14 @@ func (c *Command) processCommand() error {
} }
var err error var err error
if c.OsType != types.Ubuntu && c.OsType != types.Flatpak && c.Command != "init" && c.ContainerName == "" { if c.OsType != types.Ubuntu && c.OsType != types.Flatpak && c.Command != "init" {
cmd := exec.Command("/bin/bash", "-c", "apx subsystems list") err = c.initContainer()
var outb bytes.Buffer
cmd.Stdout = &outb
cmd.Stderr = os.Stderr
err := cmd.Run()
if err != nil { if err != nil {
log.Fatal(err) return err
} }
re := regexp.MustCompile("^" + c.ContainerSubsystem() + "$")
if re.MatchString(outb.String()) {
fmt.Println("Warning: Subsystem hasn't been pre-initialized, initializing...")
cmd_exec := exec.Command("/bin/bash", "-c", "apx subsystems new -n " + c.ContainerSubsystem() + " -s " + c.ApxSubsystem())
cmd_exec.Stdout = os.Stdout
cmd_exec.Stdin = os.Stdin
cmd_exec.Stderr = os.Stderr
if err := cmd_exec.Run(); err != nil {
fmt.Println("Apx Error: ", err)
return err
}
}
} }
if c.OsType != types.Ubuntu && c.OsType != types.Flatpak && c.Command != "init" && c.ContainerName != "" {
cmd := exec.Command("/bin/bash", "-c", "apx subsystems list")
var outb bytes.Buffer
cmd.Stdout = &outb
cmd.Stderr = os.Stderr
err := cmd.Run()
if err != nil {
log.Fatal(err)
}
re := regexp.MustCompile("^" + c.ContainerName + "$")
if re.MatchString(outb.String()) {
fmt.Println("Warning: Subsystem hasn't been pre-initialized, initializing...")
cmd_exec := exec.Command("/bin/bash", "-c", "apx subsystems new -n " + c.ContainerName + " -s " + c.ApxSubsystem())
cmd_exec.Stdin = os.Stdin
cmd_exec.Stderr = os.Stderr
cmd_exec.Stdout = os.Stdout
if err := cmd_exec.Run(); err != nil {
fmt.Println("Apx Error: ", err)
return err
}
}
}
if c.OsType != types.Ubuntu && c.OsType != types.Flatpak && c.ContainerName != "" { if c.OsType != types.Ubuntu && c.OsType != types.Flatpak && c.ContainerName != "" {
c.PackageName = append([]string{"--name " + c.ContainerName}, c.PackageName...) c.PackageName = append([]string{"--name " + c.ContainerName}, c.PackageName...)
} }
@ -173,3 +132,47 @@ func (c *Command) runUpgrades() error {
return updates.GetFlatpakUpdates(c.IsJSON) return updates.GetFlatpakUpdates(c.IsJSON)
} }
func (c *Command) initContainer() error {
contName := c.ContainerName
if contName == "" {
contName = c.ContainerSubsystem()
}
cmd := exec.Command("/bin/bash", "-c", "apx subsystems list -j")
outb, err := cmd.Output()
if err != nil {
return err
}
var out []apxSubs
err = json.Unmarshal(outb, &out)
if err != nil {
return err
}
isMatch := false
for _, sub := range out {
if sub.Name == contName {
isMatch = true
break
}
}
if !isMatch {
fmt.Println("Warning: Subsystem hasn't been pre-initialized, initializing...")
cmd_exec := exec.Command("/bin/bash", "-c", "apx subsystems new -n "+contName+" -s "+c.ApxSubsystem())
cmd_exec.Stdout = os.Stdout
cmd_exec.Stdin = os.Stdin
cmd_exec.Stderr = os.Stderr
if err := cmd_exec.Run(); err != nil {
fmt.Println("Apx Error: ", err)
return err
}
}
return nil
}
type apxSubs struct {
Name string `json:"name"`
}