From 764af03e89566559e8f4523ab2947a529ef75f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 8 Dec 2019 18:15:10 +0000
Subject: [PATCH] introduce 'garble build' shortcut

This way, the user doesn't need to remember to use flags like -a and
-trimpath. Also because we might need more 'go build' flags in the
future.
---
 main.go                    | 28 +++++++++++++++++++++++++++-
 testdata/scripts/basic.txt |  5 ++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/main.go b/main.go
index ccc543f..7ff6037 100644
--- a/main.go
+++ b/main.go
@@ -29,7 +29,11 @@ func usage() {
 	fmt.Fprintf(os.Stderr, `
 Usage of garble:
 
-	go build -toolexec=garble [build flags] [packages]
+	garble build [build flags] [packages]
+
+which is equivalent to the longer:
+
+	go build -a -trimpath -toolexec=garble [build flags] [packages]
 `[1:])
 	flagSet.PrintDefaults()
 	os.Exit(2)
@@ -55,6 +59,28 @@ func main1() int {
 	if len(args) < 1 {
 		flagSet.Usage()
 	}
+
+	// If we recognise an argument, we're not running within -toolexec.
+	switch args[0] {
+	case "build":
+		goArgs := []string{
+			"build",
+			"-a",
+			"-trimpath",
+			"-toolexec="+os.Args[0],
+		}
+		goArgs = append(goArgs, args[1:]...)
+
+		cmd := exec.Command("go", goArgs...)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		if err := cmd.Run(); err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			return 1
+		}
+		return 0
+	}
+
 	var err error
 	workingDir, err = os.Getwd()
 	if err != nil {
diff --git a/testdata/scripts/basic.txt b/testdata/scripts/basic.txt
index f1d7c0b..83cf5c9 100644
--- a/testdata/scripts/basic.txt
+++ b/testdata/scripts/basic.txt
@@ -28,10 +28,13 @@ exec readelf --section-headers main
 ! stdout '\.symtab'
 
 ! grep $WORK main
-
 ! grep 'globalVar' main
 ! grep 'globalFunc' main
 
+# Finally, check that the 'garble build' shortcut works.
+garble build main.go
+! grep 'globalVar' main
+
 -- main.go --
 package main