From ca27d3f1f339d7aecd9163172c800e1bf6f3d7ba Mon Sep 17 00:00:00 2001 From: Haruki Date: Fri, 25 Aug 2023 09:55:16 +0900 Subject: [PATCH] =?UTF-8?q?go=20embed=E3=81=A7txt=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=92=E5=9F=8B=E3=82=81=E8=BE=BC=E3=82=93?= =?UTF-8?q?=E3=81=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nostrh/main.go | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/nostrh/main.go b/nostrh/main.go index e7f9a70..2bc4f89 100644 --- a/nostrh/main.go +++ b/nostrh/main.go @@ -1,21 +1,20 @@ package main import ( - "bytes" + _ "embed" "fmt" "os" - "path/filepath" "github.com/nbd-wtf/go-nostr" "github.com/studiokaiji/nostr-webhost/nostrh/cmd/deploy" "github.com/studiokaiji/nostr-webhost/nostrh/cmd/keystore" - "github.com/studiokaiji/nostr-webhost/nostrh/cmd/paths" "github.com/studiokaiji/nostr-webhost/nostrh/cmd/relays" "github.com/studiokaiji/nostr-webhost/nostrh/cmd/server" "github.com/urfave/cli/v2" ) -const cuteOstrichFileName = "cute-ostrich.txt" +//go:embed cute-ostrich.txt +var cuteOstrich string func main() { var ( @@ -140,30 +139,7 @@ func main() { if len(os.Args) < 2 || os.Args[1] == "help" || os.Args[1] == "h" { // Display ostrich - projectDir, err := paths.GetProjectRootDirectory() - if err != nil { - fmt.Println(err) - } - - filePath := filepath.Join(projectDir, cuteOstrichFileName) - file, err := os.Open(filePath) - if err != nil { - fmt.Println(err) - } - defer file.Close() - - buf := new(bytes.Buffer) - for { - n, err := buf.ReadFrom(file) - if n == 0 { - break - } - if err != nil { - break - } - - fmt.Println(buf.String()) - } + fmt.Println(cuteOstrich) } // Start app