commit d9de17b

chld  ·  2026-02-07 02:20:43 +0000 UTC
parent 1e9a20d
adapt install to pkg
2 files changed,  +4, -23
+1, -22
 1@@ -83,28 +83,7 @@ func main() {
 2 		}
 3 	case "mi":
 4 		for i := range len(pkgs) {
 5-			in, out := os.Stdin, os.Stdout
 6-			//cmd := exec.Command("cp", "-r", filepath.Join("/var/tmp/dtr", "pkg-"+pkgs[i]+"-git", "*"), os.Getenv("DTR_ROOT"))
 7-			pkginst := filepath.Join("/var/tmp/dtr", "pkg-"+pkgs[i]+"-git", "*")
 8-			pk, err := filepath.Glob(pkginst)
 9-
10-			if err != nil || len(pk) == 0 {
11-				dgr.Die("no files to install in", pkginst, 1)
12-			}
13-
14-			args := append([]string{"-r"}, pk...)
15-			args = append(args, os.Getenv("DTR_ROOT"))
16-
17-			cmd := exec.Command("cp", args...)
18-
19-			cmd.Stdin, cmd.Stdout = in, out // asign stdin and stdout to cmd
20-			cmd.Stderr = os.Stderr          // and stderr, i guess
21-
22-			if err := cmd.Run(); err != nil {
23-				dgr.Die("failed to copy package files to root", os.Getenv("DTR_ROOT"), 1)
24-			} else {
25-				dgr.Msg("installing", pkgs[i])
26-			}
27+			dgrb.Inst(pkgs[i])
28 		}
29 	case "mic":
30 	case "sp":
+3, -1
 1@@ -7,7 +7,9 @@ import (
 2 	"path/filepath"
 3 )
 4 
 5-func Inst(pkgs []string, i int) {
 6+func Inst(pkgs []string) {
 7+	var i int
 8+
 9 	in, out := os.Stdin, os.Stdout
10 	pkginst := filepath.Join("/var/tmp/dtr", "pkg-"+pkgs[i]+"-git", "*") // hard code git for now
11 	pk, err := filepath.Glob(pkginst)