taigrr/wails
1
0
Fork 0
mirror of https://github.com/taigrr/wails.git synced 2026-04-14 19:01:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

[windows] Use forward slash paths for assetdir and wailsjsdir

Browse Source
This commit is contained in:
Lea Anthony
2021-08-31 19:38:29 +10:00
parent e718fb8333
commit 627aa06786
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
v2/cmd/wails/internal/commands/dev/dev.go
View File

@@ -112,26 +112,18 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
return fmt.Errorf("No asset directory provided. Please use -assetdir to indicate which directory contains your built assets.")
}
if assetDir != "" {
assetDir, err = filepath.Abs(assetDir)
if err != nil {
return err
}
}
if assetDir == "" && projectConfig.AssetDirectory != "" {
assetDir = projectConfig.AssetDirectory
}
if assetDir != projectConfig.AssetDirectory {
projectConfig.AssetDirectory = assetDir
projectConfig.AssetDirectory = filepath.ToSlash(assetDir)
err := projectConfig.Save()
if err != nil {
return err
}
}
wailsjsdir, err = filepath.Abs(wailsjsdir)
if err != nil {
return err
}
@@ -141,11 +133,11 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
}
if wailsjsdir == "" {
wailsjsdir = filepath.Join(cwd, "frontend")
wailsjsdir = "./frontend"
}
if wailsjsdir != projectConfig.WailsJSDir {
projectConfig.WailsJSDir = wailsjsdir
projectConfig.WailsJSDir = filepath.ToSlash(wailsjsdir)
err := projectConfig.Save()
if err != nil {
return err