From 627aa06786f92526cb11d20c3e150a0202bbbf89 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Tue, 31 Aug 2021 19:38:29 +1000 Subject: [PATCH] [windows] Use forward slash paths for assetdir and wailsjsdir --- v2/cmd/wails/internal/commands/dev/dev.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/v2/cmd/wails/internal/commands/dev/dev.go b/v2/cmd/wails/internal/commands/dev/dev.go index ab11f7bd..72df9c90 100644 --- a/v2/cmd/wails/internal/commands/dev/dev.go +++ b/v2/cmd/wails/internal/commands/dev/dev.go @@ -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