Merge branch 'v2' into etcbuilder

.github/workflows/go-pr.yml

@@ -11,7 +11,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     container:
-      image: registry.vanillaos.org/vanillaos/pico:main
+      image: ghcr.io/vanilla-os/pico:main
 
     steps:
     - uses: actions/checkout@v3
@@ -31,6 +31,15 @@ jobs:
 
     - name: Test
       run: go test -v ./tests/..
+
+    - name: Compress
+      run: tar -czvf abrootv2.tar.gz abrootv2
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: abrootv2
+        path: abrootv2.tar.gz
+
   sonar:
     name: Sonar
     runs-on: ubuntu-latest

.github/workflows/go.yml

@@ -10,7 +10,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     container:
-      image: registry.vanillaos.org/vanillaos/pico:main
+      image: ghcr.io/vanilla-os/pico:main
 
     steps:
     - uses: actions/checkout@v3

.github/workflows/release.yml

@@ -0,0 +1,36 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/vanilla-os/pico:main
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.19
+
+      - name: Install build dependencies
+        run: |
+            apt-get update
+            apt-get install -y libbtrfs-dev libdevmapper-dev libgpgme-dev pkg-config build-essential
+
+      - name: Build
+        run: go build -o abrootv2
+
+      - name: Compress
+        run: tar -czvf abrootv2.tar.gz abrootv2
+
+      - uses: softprops/action-gh-release@v1
+        with:
+          token: "${{ secrets.GITHUB_TOKEN }}"
+          files: |
+            abrootv2.tar.gz

cmd/kargs.go

@@ -14,13 +14,15 @@ package cmd
 */
 
 import (
+	"errors"
+
 	"github.com/spf13/cobra"
 
 	"github.com/vanilla-os/abroot/core"
 	"github.com/vanilla-os/orchid/cmdr"
 )
 
-var validKargsArgs = []string{"edit", "list"}
+var validKargsArgs = []string{"edit", "show"}
 
 func NewKargsCommand() *cmdr.Command {
 	cmd := cmdr.NewCommand(
@@ -30,13 +32,6 @@ func NewKargsCommand() *cmdr.Command {
 		kargs,
 	)
 
-	cmd.WithBoolFlag(
-		cmdr.NewBoolFlag(
-			"check-only",
-			"c",
-			abroot.Trans("kargs.checkOnlyFlag"),
-			false))
-
 	cmd.Args = cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs)
 	cmd.ValidArgs = validKargsArgs
 	cmd.Example = "abroot kargs edit"
@@ -50,5 +45,39 @@ func kargs(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
+	switch args[0] {
+	case "edit":
+		changed, err := core.KargsEdit()
+		if err != nil {
+			cmdr.Error.Println(err)
+			return err
+		}
+
+		if !changed {
+			cmdr.Info.Println(abroot.Trans("kargs.notChanged"))
+			return nil
+		}
+
+		aBsys, err := core.NewABSystem()
+		if err != nil {
+			cmdr.Error.Println(err)
+			return err
+		}
+		err = aBsys.RunOperation(core.APPLY)
+		if err != nil {
+			cmdr.Info.Println(abroot.Trans("pkg.applyFailed"))
+			return err
+		}
+	case "show":
+		kargsStr, err := core.KargsRead()
+		if err != nil {
+			cmdr.Error.Println(err)
+			return err
+		}
+		cmdr.Info.Println(kargsStr)
+	default:
+		return errors.New(abroot.Trans("kargs.unknownParam", args[0]))
+	}
+
 	return nil
 }

cmd/pkg.go

@@ -46,7 +46,7 @@ func pkg(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	pkgM := core.NewPackageManager()
+	pkgM := core.NewPackageManager(false)
 
 	switch args[0] {
 	case "add":
@@ -97,7 +97,7 @@ func pkg(cmd *cobra.Command, args []string) error {
 
 		err = aBsys.RunOperation(core.APPLY)
 		if err != nil {
-			cmdr.Info.Println(abroot.Trans("pkg.applyFailed"))
+			cmdr.Error.Printf(abroot.Trans("pkg.applyFailed"), err)
 			return err
 		}
 	}