Skip to content

Commit 9063293

Browse files
committed
trim suffix of arch, clean commented code
1 parent f3bafd7 commit 9063293

File tree

3 files changed

+9
-83
lines changed

3 files changed

+9
-83
lines changed

build-win-386.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
set GOARCH=386
2+
set GOOS=windows
3+
go build -o mindoc-daemon_%GOARCH%.exe main.go

build-win-amd64.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
set GOARCH=amd64
2+
set GOOS=windows
3+
go build -o mindoc-daemon_%GOARCH%.exe main.go

main.go

Lines changed: 3 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99
"os/exec"
1010
"path/filepath"
11-
// "time"
11+
"strings"
1212

1313
"github.com/kardianos/service"
1414
)
@@ -35,46 +35,6 @@ type program struct {
3535
cmd *exec.Cmd
3636
}
3737

38-
// func (p *program) runMindoc() {
39-
// // 获取命令行参数
40-
// cwd := os.Args[1] // mindoc运行目录
41-
// cmd := os.Args[2] // mindoc命令
42-
43-
// // 连续尝试次数
44-
// retries := 0
45-
// maxRetries := 5
46-
47-
// for {
48-
// // 执行mindoc命令
49-
// cmd := exec.Command(cmd, cwd)
50-
// cmd.Stdout = os.Stdout
51-
// cmd.Stderr = os.Stderr
52-
// err := cmd.Start()
53-
// if err != nil {
54-
// fmt.Println(err)
55-
// return
56-
// }
57-
58-
// // cmd.Process.Kill()
59-
60-
// // 等待mindoc运行结束,或发生错误
61-
// err = cmd.Wait()
62-
// if err != nil {
63-
// retries++
64-
// fmt.Printf("mindoc exited with error, retrying (%d/%d)...\n", retries, maxRetries)
65-
// time.Sleep(5 * time.Second)
66-
// } else {
67-
// retries = 0
68-
// }
69-
70-
// // 超过最大重试次数,退出
71-
// if retries > maxRetries {
72-
// fmt.Println(" mindoc max retries exceeded, exiting!")
73-
// return
74-
// }
75-
// }
76-
// }
77-
7838
func (p *program) run() {
7939
logger.Info("Starting ", p.DisplayName)
8040
defer func() {
@@ -132,10 +92,6 @@ func (p *program) Start(s service.Service) error {
13292
return nil
13393
}
13494

135-
// func (p *program) Restart(s service.Service) error {
136-
// return nil
137-
// }
138-
13995
func (p *program) Stop(s service.Service) error {
14096
// 停止mindoc-daemon
14197
close(p.exit)
@@ -149,14 +105,6 @@ func (p *program) Stop(s service.Service) error {
149105
return nil
150106
}
151107

152-
// func (p *program) Install(s service.Service) error {
153-
// return nil
154-
// }
155-
156-
// func (p *program) Uninstall(s service.Service) error {
157-
// return nil
158-
// }
159-
160108
func getConfigPath() (string, error) {
161109
fullexecpath, err := os.Executable()
162110
if err != nil {
@@ -166,7 +114,8 @@ func getConfigPath() (string, error) {
166114
dir, execname := filepath.Split(fullexecpath)
167115
ext := filepath.Ext(execname)
168116
name := execname[:len(execname)-len(ext)]
169-
117+
name = strings.TrimSuffix(name, "_386")
118+
name = strings.TrimSuffix(name, "_amd64")
170119
return filepath.Join(dir, name+".json"), nil
171120
}
172121

@@ -202,35 +151,6 @@ func main() {
202151
}
203152
log.Printf("dir: %s\n", dir)
204153

205-
/*
206-
svcConfig := &service.Config{
207-
Name: "mindoc-daemon",
208-
DisplayName: "mindoc Daemon Service",
209-
Description: "Service to start and monitor mindoc process",
210-
}
211-
212-
prg := &program{}
213-
s, err := service.New(prg, svcConfig)
214-
if err != nil {
215-
log.Fatal(err)
216-
}
217-
if len(os.Args) > 1 {
218-
err = service.Control(s, os.Args[1])
219-
if err != nil {
220-
log.Fatal(err)
221-
}
222-
return
223-
}
224-
logger, err = s.Logger(nil)
225-
if err != nil {
226-
log.Fatal(err)
227-
}
228-
err = s.Run()
229-
if err != nil {
230-
logger.Error(err)
231-
}
232-
*/
233-
234154
svcFlag := flag.String("service", "", "Control the system service.")
235155
flag.Parse()
236156

0 commit comments

Comments
 (0)