IntenseFinance/lazygit
3
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

small changes

Browse Source
This commit is contained in:
Jesse Duffield
2021-10-16 12:18:49 +11:00
parent 8c25aaa687
commit 3621084096
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/config/app_config.go
View File

@@ -19,9 +19,8 @@ type AppConfig struct {
Name string `long:"name" env:"NAME" default:"lazygit"` Name string `long:"name" env:"NAME" default:"lazygit"`
BuildSource string `long:"build-source" env:"BUILD_SOURCE" default:""` BuildSource string `long:"build-source" env:"BUILD_SOURCE" default:""`
UserConfig *UserConfig UserConfig *UserConfig
UserConfigFiles []string UserConfigPaths []string
DeafultConfFiles bool DeafultConfFiles bool
UserConfigPath string
UserConfigDir string UserConfigDir string
TempDir string TempDir string
AppState *AppState AppState *AppState
@@ -38,9 +37,8 @@ type AppConfigurer interface {
GetName() string GetName() string
GetBuildSource() string GetBuildSource() string
GetUserConfig() *UserConfig GetUserConfig() *UserConfig
GetUserConfigFiles() []string GetUserConfigPaths() []string
GetUserConfigDir() string GetUserConfigDir() string
GetUserConfigPath() string
GetTempDir() string GetTempDir() string
GetAppState() *AppState GetAppState() *AppState
SaveAppState() error SaveAppState() error
@@ -56,17 +54,17 @@ func NewAppConfig(name, version, commit, date string, buildSource string, debugg
return nil, err return nil, err
} }
var userConfigFiles []string var userConfigPaths []string
customConfigFiles := os.Getenv("LG_CONFIG_FILE") customConfigFiles := os.Getenv("LG_CONFIG_FILE")
if customConfigFiles != "" { if customConfigFiles != "" {
// Load user defined config files // Load user defined config files
userConfigFiles = strings.Split(customConfigFiles, ",") userConfigPaths = strings.Split(customConfigFiles, ",")
} else { } else {
// Load default config files // Load default config files
userConfigFiles = []string{filepath.Join(configDir, ConfigFilename)} userConfigPaths = []string{filepath.Join(configDir, ConfigFilename)}
} }
userConfig, err := loadUserConfigWithDefaults(userConfigFiles) userConfig, err := loadUserConfigWithDefaults(userConfigPaths)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -90,9 +88,8 @@ func NewAppConfig(name, version, commit, date string, buildSource string, debugg
Debug: debuggingFlag, Debug: debuggingFlag,
BuildSource: buildSource, BuildSource: buildSource,
UserConfig: userConfig, UserConfig: userConfig,
UserConfigFiles: userConfigFiles, UserConfigPaths: userConfigPaths,
UserConfigDir: configDir, UserConfigDir: configDir,
UserConfigPath: filepath.Join(configDir, "config.yml"),
TempDir: tempDir, TempDir: tempDir,
AppState: appState, AppState: appState,
IsNewRepo: false, IsNewRepo: false,
@@ -220,8 +217,8 @@ func (c *AppConfig) GetAppState() *AppState {
return c.AppState return c.AppState
} }
func (c *AppConfig) GetUserConfigFiles() []string { func (c *AppConfig) GetUserConfigPaths() []string {
return c.UserConfigFiles return c.UserConfigPaths
} }
func (c *AppConfig) GetUserConfigDir() string { func (c *AppConfig) GetUserConfigDir() string {
@@ -233,7 +230,7 @@ func (c *AppConfig) GetTempDir() string {
} }
func (c *AppConfig) ReloadUserConfig() error { func (c *AppConfig) ReloadUserConfig() error {
userConfig, err := loadUserConfigWithDefaults(c.UserConfigFiles) userConfig, err := loadUserConfigWithDefaults(c.UserConfigPaths)
if err != nil { if err != nil {
return err return err
} }

12
pkg/gui/status_panel.go
View File

@@ -116,20 +116,20 @@ func (gui *Gui) handleStatusSelect() error {
} }
func (gui *Gui) askForConfigFile(action func(file string) error) error { func (gui *Gui) askForConfigFile(action func(file string) error) error {
confFiles := gui.Config.GetUserConfigFiles() confPaths := gui.Config.GetUserConfigPaths()
switch len(confFiles) { switch len(confPaths) {
case 0: case 0:
return errors.New(gui.Tr.NoConfigFileFoundErr) return errors.New(gui.Tr.NoConfigFileFoundErr)
case 1: case 1:
return action(confFiles[0]) return action(confPaths[0])
default: default:
menuItems := make([]*menuItem, len(confFiles)) menuItems := make([]*menuItem, len(confPaths))
for i, file := range confFiles { for i, file := range confPaths {
i := i i := i
menuItems[i] = &menuItem{ menuItems[i] = &menuItem{
displayString: file, displayString: file,
onPress: func() error { onPress: func() error {
return action(confFiles[i]) return action(confPaths[i])
}, },
} }
} }