From fb5b7ed0d4be7410c90945bfeee02252cac792dd Mon Sep 17 00:00:00 2001 From: Chen-I Lim Date: Tue, 3 Nov 2020 16:12:39 -0800 Subject: [PATCH] Move octoserver.exe to bin --- .gitignore | 1 + Makefile | 3 ++- win/main.go | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4a801eff9..2f25301d8 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ mac/dist linux/bin linux/dist linux/temp +win/dist diff --git a/Makefile b/Makefile index 2af8f7588..76bc312a5 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,8 @@ mac-app: server webapp win-app: server-win64 webapp cd win; make build - cp -R bin/octoserver.exe win/dist + mkdir -p win/dist/bin + cp -R bin/octoserver.exe win/dist/bin cp -R config.json win/dist mkdir -p win/dist/webapp cp -R webapp/pack win/dist/webapp/pack diff --git a/win/main.go b/win/main.go index 7ff012567..2b16ea192 100644 --- a/win/main.go +++ b/win/main.go @@ -11,10 +11,10 @@ import ( ) func runOctoTasks(ctx context.Context) *exec.Cmd { - // cmd := exec.CommandContext(ctx, "octoserver.exe", "--monitorpid", strconv.FormatInt(int64(os.Getpid()), 10)) - cmd := exec.CommandContext(ctx, "octoserver.exe") - // cmd := exec.CommandContext(ctx, "cmd.exe", "/C", "start", "./octoserver.exe", "--monitorpid", strconv.FormatInt(int64(os.Getpid()), 10)) - // cmd := exec.CommandContext(ctx, "cmd.exe", "/C", "start", "./octoserver.exe") + // cmd := exec.CommandContext(ctx, "bin/octoserver.exe", "--monitorpid", strconv.FormatInt(int64(os.Getpid()), 10)) + cmd := exec.CommandContext(ctx, "bin/octoserver.exe") + // cmd := exec.CommandContext(ctx, "cmd.exe", "/C", "start", "./bin/octoserver.exe", "--monitorpid", strconv.FormatInt(int64(os.Getpid()), 10)) + // cmd := exec.CommandContext(ctx, "cmd.exe", "/C", "start", "./bin/octoserver.exe") // cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true} cmd.Stdout = os.Stdout