mirror of
https://github.com/wailsapp/wails.git
synced 2025-05-06 10:01:06 +08:00
[v2] Re-enable cli flags for assetdir if needed. Fixes debugging from IDE.
This commit is contained in:
parent
f489347fca
commit
a9268bc56e
@ -5,6 +5,7 @@ package appng
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"flag"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
@ -58,10 +59,37 @@ func CreateApp(appoptions *options.App) (*App, error) {
|
|||||||
myLogger.SetLogLevel(appoptions.LogLevel)
|
myLogger.SetLogLevel(appoptions.LogLevel)
|
||||||
|
|
||||||
// Check for CLI Flags
|
// Check for CLI Flags
|
||||||
|
var assetdirFlag *string
|
||||||
|
var devServerURLFlag *string
|
||||||
|
var loglevelFlag *string
|
||||||
|
|
||||||
assetdir := os.Getenv("assetdir")
|
assetdir := os.Getenv("assetdir")
|
||||||
|
if assetdir == "" {
|
||||||
|
assetdirFlag = flag.String("assetdir", "", "Directory to serve assets")
|
||||||
|
}
|
||||||
devServerURL := os.Getenv("devserverurl")
|
devServerURL := os.Getenv("devserverurl")
|
||||||
|
if devServerURL == "" {
|
||||||
|
devServerURLFlag = flag.String("devserverurl", "", "URL of development server")
|
||||||
|
}
|
||||||
|
|
||||||
loglevel := os.Getenv("loglevel")
|
loglevel := os.Getenv("loglevel")
|
||||||
|
if loglevel == "" {
|
||||||
|
loglevelFlag = flag.String("loglevel", "debug", "Loglevel to use - Trace, Debug, Info, Warning, Error")
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we weren't given the assetdir in the environment variables
|
||||||
|
if assetdir == "" {
|
||||||
|
flag.Parse()
|
||||||
|
if assetdirFlag != nil {
|
||||||
|
assetdir = *assetdirFlag
|
||||||
|
}
|
||||||
|
if devServerURLFlag != nil {
|
||||||
|
devServerURL = *devServerURLFlag
|
||||||
|
}
|
||||||
|
if loglevelFlag != nil {
|
||||||
|
loglevel = *loglevelFlag
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if devServerURL != "" {
|
if devServerURL != "" {
|
||||||
ctx = context.WithValue(ctx, "devserverurl", devServerURL)
|
ctx = context.WithValue(ctx, "devserverurl", devServerURL)
|
||||||
|
Loading…
Reference in New Issue
Block a user