Replaced the relative path on Windows with an absolute path

master
Aadhavan Srinivasan 4 months ago
parent b511c14cc3
commit b65cef96c3

@ -6,7 +6,6 @@ import (
"errors" "errors"
"io/fs" "io/fs"
"os" "os"
"os/user"
"path/filepath" "path/filepath"
"regexp" "regexp"
"runtime" "runtime"
@ -24,21 +23,10 @@ func runningOnWindows() bool {
// generateDefaultConfigs is used to generate a folder of default config files // generateDefaultConfigs is used to generate a folder of default config files
// for common languages. These default config files are embedded into the program, and will // for common languages. These default config files are embedded into the program, and will
// be outputted into a directory. // be outputted into the given directory.
// //
// If there is an error encountered, the error is returned. // If there is an error encountered, the error is returned.
func generateDefaultConfigs() error { func generateDefaultConfigs(configOutputPath string) error {
var configOutputPath string // Location of config files, depends on OS
if runningOnWindows() {
configOutputPath = "%APPDATA%\\ccat"
} else {
currentUser, err := user.Current()
if err != nil {
panic(err)
}
configOutputPath = filepath.Join("/home/" + currentUser.Username + "/.config/ccat/")
}
err := os.MkdirAll(configOutputPath, 0755) err := os.MkdirAll(configOutputPath, 0755)
if err != nil { if err != nil {
if os.IsExist(err) { if os.IsExist(err) {

@ -78,18 +78,19 @@ func main() {
flag.Parse() flag.Parse()
// Check if config exists. If it doesn't, generate the config files. // Check if config exists. If it doesn't, generate the config files.
var configPath string // Location of config files, depends on OS var configPath string // Location of config files, depends on OS
currentUser, err := user.Current() // Get current user, to determine config path
if err != nil {
panic(err)
}
if runningOnWindows() { if runningOnWindows() {
configPath = "%APPDATA%\\ccat" configPath = filepath.Join("C:\\Users" + currentUser.Username + "AppData\\Local\\ccat\\")
} else { } else {
currentUser, err := user.Current()
if err != nil {
panic(err)
}
configPath = filepath.Join("/home/" + currentUser.Username + "/.config/ccat/") configPath = filepath.Join("/home/" + currentUser.Username + "/.config/ccat/")
} }
if _, err := os.Stat(configPath); os.IsNotExist(err) { if _, err := os.Stat(configPath); os.IsNotExist(err) {
generateDefaultConfigs() generateDefaultConfigs(configPath)
} }
// Check if user has provided a file name // Check if user has provided a file name

Loading…
Cancel
Save