Push x2
Browse files
+8 −2 src/Main.hx
| @@ -32,6 +32,7 @@ class Main { | ||
| 32 | 32 | static var targetRoot = "/"; |
| 33 | 33 | static var showRepo = false; |
| 34 | 34 | static var update = false; |
| 35 | + static var quiet = false; | |
| 35 | 36 | static var syncFlag = false; |
| 36 | 37 | static var syncOnly: Null<String> = null; |
| 37 | 38 | static var explainAtom: Null<String> = null; |
| @@ -672,7 +673,9 @@ class Main { | ||
| 672 | 673 | Sys.println(""); |
| 673 | 674 | Sys.println(c("1;32", ">>> Emerging " + pos) + c("1;37", fullLabel(e))); |
| 674 | 675 | |
| 675 | - var build = Sys.command("ebuild", [e.path, "clean", "unpack", "prepare", "configure", "compile", "install"]); | |
| 676 | + var buildCmd = "ebuild " + e.path + " clean unpack prepare configure compile install"; | |
| 677 | + if (quiet) buildCmd += " > /dev/null 2>&1"; | |
| 678 | + var build = Sys.command("sh", ["-c", buildCmd]); | |
| 676 | 679 | if (build != 0) { |
| 677 | 680 | Sys.println(c("1;31", ">>> Failed " + pos + fullLabel(e) + " (build exit " + build + ")")); |
| 678 | 681 | return false; |
| @@ -680,7 +683,9 @@ class Main { | ||
| 680 | 683 | |
| 681 | 684 | Sys.println(c("1;32", ">>> Installing " + pos) + c("1;37", fullLabel(e))); |
| 682 | 685 | |
| 683 | - var merge = Sys.command("ebuild", [e.path, "qmerge"]); | |
| 686 | + var mergeCmd = "ebuild " + e.path + " qmerge"; | |
| 687 | + if (quiet) mergeCmd += " > /dev/null 2>&1"; | |
| 688 | + var merge = Sys.command("sh", ["-c", mergeCmd]); | |
| 684 | 689 | if (merge != 0) { |
| 685 | 690 | Sys.println(c("1;31", ">>> Failed " + pos + fullLabel(e) + " (merge exit " + merge + ")")); |
| 686 | 691 | return false; |
| @@ -714,6 +719,7 @@ class Main { | ||
| 714 | 719 | case "--ask" | "-a": ask = true; |
| 715 | 720 | case "--verbose" | "-v": verbose = true; |
| 716 | 721 | case "--update" | "-u": update = true; |
| 722 | + case "--quiet" | "-q": quiet = true; | |
| 717 | 723 | case "--sync": |
| 718 | 724 | syncFlag = true; |
| 719 | 725 | if (idx < args.length && Sync.repoNames().indexOf(args[idx]) >= 0) { |