rename to forge, rename to resourcesv0.21.1

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 12 insertions, 11 deletions

diff --git a/main.go b/main.go
index f0111de..1b7b68e 100644
--- a/main.go
+++ b/main.go
@@ -12,7 +12,7 @@ import (
 )
 
 //go:embed resources/*
-var htmlFiles embed.FS
+var resources embed.FS
 
 var accessf, clientf *os.File
 
@@ -52,11 +52,11 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if tmp == "/old" {
-		findFile(w, "files/index.html")
+		writeFile(w, "index.html")
 		return
 	}
 	if tmp == "/install.sh" {
-		findFile(w, "files/install.sh")
+		writeFile(w, "install.sh")
 		return
 	}
 	if tmp == "/me" {
@@ -81,19 +81,19 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if tmp == "/list" {
-		findFile(w, "files/repomap")
+		writeFile(w, "repomap")
 		return
 	}
 	if tmp == "/test" {
-		findFile(w, "files/test.html")
+		writeFile(w, "test.html")
 		return
 	}
 	if tmp == "/goReference.svg" {
-		findFile(w, "files/goReference.svg")
+		writeFile(w, "goReference.svg")
 		return
 	}
 	if tmp == "/skeleton.v2.css" {
-		findFile(w, "files/skeleton.v2.css")
+		writeFile(w, "skeleton.v2.css")
 		return
 	}
 	log.Warn("BAD URL =", url, "REPO URL =", repourl)
@@ -101,9 +101,10 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 	// fmt.Fprintln(w, "BAD", tmp)
 }
 
-func findFile(w http.ResponseWriter, filename string) {
+func writeFile(w http.ResponseWriter, filename string) {
 	// fmt.Fprintln(w, "GOT TEST?")
-	pfile, err := htmlFiles.ReadFile(filename)
+	fullname := "resources/" + filename
+	pfile, err := resources.ReadFile(fullname)
 	if err != nil {
 		log.Println("ERROR:", err)
 		// w.Write(pfile)
@@ -112,11 +113,11 @@ func findFile(w http.ResponseWriter, filename string) {
 
 	var repohtml string
 	repohtml = string(pfile)
-	if filename == "files/goReference.svg" {
+	if filename == "goReference.svg" {
 		w.Header().Set("Content-Type", "image/svg+xml")
 	}
 	fmt.Fprintln(w, repohtml)
-	log.Println("findFile() found internal file:", filename)
+	log.Println("writeFile() found internal file:", filename)
 	// w.Close()
 	/*
 		filename = "/tmp/" + name + ".so"