Skip to content

Commit

Permalink
fix: get current directory by working directory instead of ./
Browse files Browse the repository at this point in the history
  • Loading branch information
JadeMin committed Dec 18, 2023
1 parent c742f96 commit 25686b1
Showing 1 changed file with 30 additions and 14 deletions.
44 changes: 30 additions & 14 deletions initier/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,39 @@ package initier
import (
fmt "fmt"
os "os"
json "encoding/json"
filepath "path/filepath"
json "encoding/json"
)

type Device struct {
Speaker string `json:"speaker"`
Headset string `json:"headset"`
}

type Config struct {
Device Device `json:"device"`
}

const (
CONFIG_PATH = "./config.json"
CUR_PATH = "./cur"
var cwd string
var (
NIRCMD_PATH string
CONFIG_PATH string
CUR_PATH string
)
var NIRCMD_PATH string

func checkHasNirCMD(directory string) (string, error) {
func init() {
ex, err := os.Executable()
if err != nil {
panic(err)
}

cwd = filepath.Dir(ex)


CONFIG_PATH = filepath.Join(cwd, "config.json")
CUR_PATH = filepath.Join(cwd, "cur")
}

func checkHasNirCMD(directory string, findC bool) (string, error) {
var (
checker string
err error
Expand All @@ -35,27 +48,30 @@ func checkHasNirCMD(directory string) (string, error) {
return checker, nil
}

checker = filepath.Join(directory, "nircmdc.exe")
_, err = os.Stat(checker)
if err == nil {
return checker, nil
if findC == true {
checker = filepath.Join(directory, "nircmdc.exe")
_, err = os.Stat(checker)
if err == nil {
return checker, nil
}
}

return "", err
}

func getNirCMDPath() (string, error) {
var (
nircmd string
err error
)


nircmd, err = checkHasNirCMD(os.Getenv("WINDIR"))
nircmd, err = checkHasNirCMD(os.Getenv("WINDIR"), true)
if err == nil {
return nircmd, nil
}

nircmd, err = checkHasNirCMD("./")
nircmd, err = checkHasNirCMD(cwd, true)
if err == nil {
return nircmd, nil
}
Expand Down Expand Up @@ -90,7 +106,7 @@ func InitConfig() {
if err != nil {
panic(err)
}

err = os.WriteFile(CONFIG_PATH, file, 0644)
if err != nil {
panic(err)
Expand Down

0 comments on commit 25686b1

Please sign in to comment.