aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorChristine Dodrill <me@christine.website>2019-04-05 16:27:26 +0000
committerChristine Dodrill <me@christine.website>2019-04-05 16:27:35 +0000
commit53de3948151edcf002d42fb4879e07ccb0be0969 (patch)
treec573f28df1832211a58700959ea665c608731efd /cmd
parentcedc40aee04bb8c4323096c44ff3c7b3157f9990 (diff)
downloadx-53de3948151edcf002d42fb4879e07ccb0be0969.tar.xz
x-53de3948151edcf002d42fb4879e07ccb0be0969.zip
cmd/johaus: make this a bit forward compatible
Diffstat (limited to 'cmd')
-rw-r--r--cmd/johaus/build.go2
-rw-r--r--cmd/johaus/main.go10
2 files changed, 6 insertions, 6 deletions
diff --git a/cmd/johaus/build.go b/cmd/johaus/build.go
index 34e09c0..5241feb 100644
--- a/cmd/johaus/build.go
+++ b/cmd/johaus/build.go
@@ -18,7 +18,7 @@ func main() {
defer cancel()
env := append(os.Environ(), []string{"CGO_ENABLED=0", "GOOS=linux"}...)
- yeet.ShouldWork(ctx, env, yeet.WD, "vgo", "build", "-o=web")
+ yeet.ShouldWork(ctx, env, yeet.WD, "go", "build", "-o=web")
yeet.ShouldWork(ctx, env, yeet.WD, "appsluggr", "-web=web")
fin, err := os.Open("slug.tar.gz")
if err != nil {
diff --git a/cmd/johaus/main.go b/cmd/johaus/main.go
index 5c9c59e..8606415 100644
--- a/cmd/johaus/main.go
+++ b/cmd/johaus/main.go
@@ -13,10 +13,9 @@ import (
"within.website/johaus/pretty"
)
-const dialect = "camxes"
-
var (
- port = flag.String("port", "9001", "TCP port to bind on for HTTP")
+ port = flag.String("port", "9001", "TCP port to bind on for HTTP")
+ dialect = flag.String("dialect", "camxes", "Lojban dialect to use")
)
func main() {
@@ -37,7 +36,7 @@ func braces(w http.ResponseWriter, r *http.Request) {
return
}
- tree, err := parser.Parse(dialect, string(data))
+ tree, err := parser.Parse(*dialect, string(data))
if err != nil {
http.Error(w, "can't parse: "+err.Error(), http.StatusBadRequest)
return
@@ -50,6 +49,7 @@ func braces(w http.ResponseWriter, r *http.Request) {
pretty.Braces(w, tree)
}
+
func tree(w http.ResponseWriter, r *http.Request) {
data, err := ioutil.ReadAll(r.Body)
if err != nil {
@@ -57,7 +57,7 @@ func tree(w http.ResponseWriter, r *http.Request) {
return
}
- tree, err := parser.Parse(dialect, string(data))
+ tree, err := parser.Parse(*dialect, string(data))
if err != nil {
http.Error(w, "can't parse: "+err.Error(), http.StatusBadRequest)
return