mirror of
				https://github.com/jesseduffield/lazygit.git
				synced 2025-10-30 23:57:43 +02:00 
			
		
		
		
	Implement suggestions
This commit is contained in:
		
				
					committed by
					
						 Jesse Duffield
						Jesse Duffield
					
				
			
			
				
	
			
			
			
						parent
						
							1f27002b84
						
					
				
				
					commit
					7513bfb13a
				
			
							
								
								
									
										2
									
								
								main.go
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								main.go
									
									
									
									
									
								
							| @@ -100,7 +100,7 @@ func main() { | ||||
| 	} | ||||
|  | ||||
| 	if configDirFlag { | ||||
| 		fmt.Printf("%s\n", config.ConfigDir("jesseduffield")) | ||||
| 		fmt.Printf("%s\n", config.ConfigDir()) | ||||
| 		os.Exit(0) | ||||
| 	} | ||||
|  | ||||
|   | ||||
| @@ -81,28 +81,26 @@ func NewAppConfig(name, version, commit, date string, buildSource string, debugg | ||||
| 	return appConfig, nil | ||||
| } | ||||
|  | ||||
| func SelectDefaultConfiguration() string { | ||||
| 	legacyConfigDirectory := ConfigDir("jesseduffield") | ||||
| func ConfigDir() string { | ||||
| 	legacyConfigDirectory := configDirForVendor("jesseduffield") | ||||
| 	if _, err := os.Stat(legacyConfigDirectory); !os.IsNotExist(err) { | ||||
| 		return legacyConfigDirectory | ||||
| 	} | ||||
| 	configDirectory := ConfigDir("") | ||||
| 	configDirectory := configDirForVendor("") | ||||
| 	return configDirectory | ||||
| } | ||||
|  | ||||
| func ConfigDir(vendor string) string { | ||||
| func configDirForVendor(vendor string) string { | ||||
| 	envConfigDir := os.Getenv("CONFIG_DIR") | ||||
| 	if envConfigDir != "" { | ||||
| 		return envConfigDir | ||||
| 	} | ||||
| 	// chucking my name there is not for vanity purposes, the xdg spec (and that | ||||
| 	// function) requires a vendor name. May as well line up with github | ||||
| 	configDirs := xdg.New(vendor, "lazygit") | ||||
| 	return configDirs.ConfigHome() | ||||
| } | ||||
|  | ||||
| func findOrCreateConfigDir() (string, error) { | ||||
| 	folder := SelectDefaultConfiguration() | ||||
| 	folder := ConfigDir() | ||||
| 	err := os.MkdirAll(folder, 0755) | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
|   | ||||
		Reference in New Issue
	
	Block a user