commit f7d2d2e
chld
·
2026-02-07 06:58:41 +0000 UTC
parent 99d2d43
install improve
3 files changed,
+13,
-17
+3,
-0
1@@ -1,8 +1,10 @@
2 package dgr
3
4 import (
5+ //"fmt"
6 "os"
7 "os/exec"
8+ //"strings"
9 )
10
11 func Run(a string, b ...string) error {
12@@ -11,5 +13,6 @@ func Run(a string, b ...string) error {
13 cmd.Stdin, cmd.Stdout = in, out // asign stdin and stdout to cmd
14 cmd.Stderr = os.Stderr // and stderr, i guess
15
16+ //fmt.Printf("+ %s %s\n", a, strings.Join(b, " "))
17 return cmd.Run()
18 }
M
main.go
+4,
-0
1@@ -175,6 +175,10 @@ func main() {
2
3 dgrb.Build(pkgs[i], "make")
4 }
5+ case "i":
6+ for i := range len(pkgs) {
7+ dgrb.Inst(pkgs[i])
8+ }
9 case "mi":
10 for i := range len(pkgs) {
11 dgrb.Build(pkgs[i], "make")
+6,
-17
1@@ -1,38 +1,27 @@
2 package dgrb
3
4 import (
5- "fmt"
6 "git.sr.ht/~chld/dgr/cmd"
7- "io/fs"
8 "os"
9 "path/filepath"
10 )
11
12 func Inst(pkg string) {
13+ dgr.Msg("installing \033[1;32m", pkg, "\033[m")
14+ pkginst := filepath.Join("/var/tmp/dtr", "/pkg-"+pkg+"-*")
15+ pk, _ := filepath.Glob(pkginst + "/*") // globbing final boss
16
17- pkginst := filepath.Join("/var/tmp/dtr", "pkg-"+pkg+"-*")
18- pk, err := filepath.Glob(pkginst + "/*") // globbing final boss
19-
20- if err != nil || len(pk) == 0 {
21+ if len(pk) == 0 {
22 dgr.Die("no files to install in", pkginst, 1)
23 }
24
25 args := append([]string{"-r"}, pk...)
26 args = append(args, os.Getenv("DTR_ROOT"))
27
28- err = dgr.Run("cp", args...)
29+ err := dgr.Run("cp", args...)
30 if err != nil {
31 dgr.Die("failed to copy package files to root", os.Getenv("DTR_ROOT"), 1)
32 } else {
33- dgr.Msg("installing", pkg)
34-
35- filepath.WalkDir(pkginst, func(path string, d fs.DirEntry, err error) error {
36- if err != nil {
37- fmt.Println(err)
38- }
39- fmt.Println(path)
40- return nil
41- })
42-
43+ dgr.Msg("installed \033[1;32m", pkg, "\033[m successfully")
44 }
45 }