commit 5d8f7fe
chld
·
2026-02-07 03:11:17 +0000 UTC
parent 58bb1c1
Run()
2 files changed,
+20,
-12
M
main.go
+16,
-0
1@@ -0,0 +1,16 @@
2+package dgr
3+
4+import (
5+ "os"
6+ "os/exec"
7+)
8+
9+func Run(a ...string) error {
10+ in, out := os.Stdin, os.Stdout
11+ cmd := exec.Command(a[0], a[1:]...)
12+ cmd.Stdin, cmd.Stdout = in, out // asign stdin and stdout to cmd
13+ cmd.Stderr = os.Stderr // and stderr, i guess
14+
15+ return cmd.Run()
16+
17+}
M
main.go
+4,
-12
1@@ -55,23 +55,15 @@ func main() {
2 dgr.Msg("cloning", "codeberg.org/derivelinux/ports")
3 os.RemoveAll(os.Getenv("DTR_DIR"))
4
5- in, out := os.Stdin, os.Stdout
6- cmd := exec.Command("git", "clone", "--depth", "1", "https://codeberg.org/derivelinux/ports", os.Getenv("DTR_DIR"))
7- cmd.Stdin, cmd.Stdout = in, out // asign stdin and stdout to cmd
8- cmd.Stderr = os.Stderr // and stderr, i guess
9-
10- if err := cmd.Run(); err != nil {
11+ err := dgr.Run("git", "clone", "--depth", "1", "https://codeberg.org/derivelinux/ports", os.Getenv("DTR_DIR"))
12+ if err != nil {
13 dgr.Die("failed to clone", "codeberg.org/derivelinux/ports", 1)
14 }
15 case "us":
16 os.Chdir(os.Getenv("DTR_DIR"))
17
18- in, out := os.Stdin, os.Stdout
19- cmd := exec.Command("git", "pull")
20- cmd.Stdin, cmd.Stdout = in, out // asign stdin and stdout to cmd
21- cmd.Stderr = os.Stderr // and stderr, i guess
22-
23- if err := cmd.Run(); err != nil {
24+ err := dgr.Run("git", "pull")
25+ if err != nil {
26 wd, _ := os.Getwd()
27 dgr.Die("failed to git pull in", wd, 1)
28 }