From b7826860632296cfa321e57a33439c253cad1924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Fri, 12 Apr 2019 23:50:23 +0200 Subject: [PATCH] label-tool: don't hardcode the BDF path or listening port --- label-tool/main.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/label-tool/main.go b/label-tool/main.go index dd4f8c2..79cac4c 100644 --- a/label-tool/main.go +++ b/label-tool/main.go @@ -261,20 +261,27 @@ func handle(w http.ResponseWriter, r *http.Request) { } func main() { + if len(os.Args) != 3 { + log.Fatalf("usage: %s ADDRESS BDF-FILE\n", os.Args[0]) + } + + address, bdf_path := os.Args[1], os.Args[2] + var err error - fi, err := os.Open("../../ucs-fonts-75dpi100dpi/100dpi/luBS24.bdf") + fi, err := os.Open(bdf_path) if err != nil { log.Fatalln(err) } + font, err = bdf.NewFromBDF(fi) - if err != nil { + if err := fi.Close(); err != nil { log.Fatalln(err) } - if err := fi.Close(); err != nil { + if err != nil { log.Fatalln(err) } log.Println("starting server") http.HandleFunc("/", handle) - log.Fatal(http.ListenAndServe(":8080", nil)) + log.Fatal(http.ListenAndServe(address, nil)) }