build fixes

kjk · Sep 28, 2023 · 70e72b8 · 70e72b8
1 parent 4f2cc3a
commit 70e72b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ yarn.lock
 yarn-error.log
 .DS_Store
 bun.lockb
+onlinetool-*
diff --git a/server/deploy.go b/server/deploy.go
@@ -220,11 +220,11 @@ func buildForProd(forLinux bool) string {
 	os.RemoveAll(frontEndBuildDir)
 
 	if u.IsMac() {
-		runCmdLoggedInDir("frontend", "bun", "install")
-		runCmdLoggedInDir("frontend", "bun", "run", "build")
+		runCmdLoggedInDir(".", "bun", "install")
+		runCmdLoggedInDir(".", "bun", "run", "build")
 	} else {
-		runCmdLoggedInDir("frontend", "yarn")
-		runCmdLoggedInDir("frontend", "yarn", "build")
+		runCmdLoggedInDir(".", "yarn")
+		runCmdLoggedInDir(".", "yarn", "build")
 	}
 
 	// get date and hash of current checkin

diff --git a/server/server.go b/server/server.go
@@ -231,7 +231,7 @@ func makeHTTPServer(proxyHandler *httputil.ReverseProxy, fsys fs.FS) *http.Serve
 		Handler:      http.HandlerFunc(handlerWithMetrics),
 	}
 	httpAddr := fmt.Sprintf(":%d", httpPort)
-	if isDev() {
+	if isWinOrMac() {
 		httpAddr = "localhost" + httpAddr
 	}
 	httpSrv.Addr = httpAddr

diff --git a/vite.config.js b/vite.config.js
@@ -78,11 +78,11 @@ export default defineConfig({
           targets: [
             {
               src: "./frontend/notepad2/**/*.bmp",
-              dest: resolve("dist", "notepad2"),
+              dest: resolve("frontend", "dist", "notepad2"),
             },
             {
               src: "./frontend/libarchive/**/*",
-              dest: resolve("dist", "libarchive"),
+              dest: resolve("frontend", "dist", "libarchive"),
             },
           ],
         }),