aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorChristine Dodrill <me@christine.website>2019-04-01 10:05:03 -0700
committerChristine Dodrill <me@christine.website>2019-04-01 10:05:28 -0700
commitf06f021f402270951f849dde7bee3f3340b8a1d5 (patch)
treebaee337aab524f162b349d254d21c2d8f2716d44 /internal
parentba91a17859267201b1d1f0e71da465b1464d940f (diff)
downloadx-f06f021f402270951f849dde7bee3f3340b8a1d5.tar.xz
x-f06f021f402270951f849dde7bee3f3340b8a1d5.zip
reorg
Diffstat (limited to 'internal')
-rw-r--r--internal/license.go2
-rw-r--r--internal/mainsa/cmd/mainsanow/main.go21
-rw-r--r--internal/yeet/yeet.go4
3 files changed, 3 insertions, 24 deletions
diff --git a/internal/license.go b/internal/license.go
index 7251eec..7b4cbae 100644
--- a/internal/license.go
+++ b/internal/license.go
@@ -5,7 +5,7 @@ import (
"net/http"
"os"
- "github.com/Xe/x/tools/license/licenses"
+ "github.com/Xe/x/cmd/license/licenses"
"go4.org/legal"
)
diff --git a/internal/mainsa/cmd/mainsanow/main.go b/internal/mainsa/cmd/mainsanow/main.go
deleted file mode 100644
index bb3df15..0000000
--- a/internal/mainsa/cmd/mainsanow/main.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package main
-
-import (
- "flag"
- "log"
- "time"
-
- "github.com/Xe/x/internal"
- "github.com/Xe/x/internal/mainsa"
-)
-
-func main() {
- flag.Parse()
- internal.HandleStartup()
-
- tn, err := mainsa.At(time.Now())
- if err != nil {
- log.Fatal(err)
- }
- log.Printf("%s", tn)
-}
diff --git a/internal/yeet/yeet.go b/internal/yeet/yeet.go
index 227b6a8..d066cf0 100644
--- a/internal/yeet/yeet.go
+++ b/internal/yeet/yeet.go
@@ -42,14 +42,14 @@ func ShouldWork(ctx context.Context, env []string, dir string, cmdName string, a
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
- log.Printf("starting process, env: %v, pwd: %s, cmd: %s, args: %v", env, dir, loc, args)
+ log.Printf("starting process, pwd: %s, cmd: %s, args: %v", dir, loc, args)
err = cmd.Run()
if err != nil {
log.Fatal(err)
}
}
-/// Output returns the output of a command or an error.
+// Output returns the output of a command or an error.
func Output(ctx context.Context, cmd string, args ...string) (string, error) {
c := exec.CommandContext(ctx, cmd, args...)
c.Env = os.Environ()