Replaced the relative path on Windows with an absolute path
This commit is contained in:
16
config.go
16
config.go
@@ -6,7 +6,6 @@ import (
|
||||
"errors"
|
||||
"io/fs"
|
||||
"os"
|
||||
"os/user"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"runtime"
|
||||
@@ -24,21 +23,10 @@ func runningOnWindows() bool {
|
||||
|
||||
// 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
|
||||
// be outputted into a directory.
|
||||
// be outputted into the given directory.
|
||||
//
|
||||
// If there is an error encountered, the error is returned.
|
||||
func generateDefaultConfigs() 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/")
|
||||
}
|
||||
func generateDefaultConfigs(configOutputPath string) error {
|
||||
err := os.MkdirAll(configOutputPath, 0755)
|
||||
if err != nil {
|
||||
if os.IsExist(err) {
|
||||
|
11
main.go
11
main.go
@@ -79,17 +79,18 @@ func main() {
|
||||
|
||||
// Check if config exists. If it doesn't, generate the config files.
|
||||
var configPath string // Location of config files, depends on OS
|
||||
if runningOnWindows() {
|
||||
configPath = "%APPDATA%\\ccat"
|
||||
} else {
|
||||
currentUser, err := user.Current()
|
||||
currentUser, err := user.Current() // Get current user, to determine config path
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if runningOnWindows() {
|
||||
configPath = filepath.Join("C:\\Users" + currentUser.Username + "AppData\\Local\\ccat\\")
|
||||
} else {
|
||||
|
||||
configPath = filepath.Join("/home/" + currentUser.Username + "/.config/ccat/")
|
||||
}
|
||||
if _, err := os.Stat(configPath); os.IsNotExist(err) {
|
||||
generateDefaultConfigs()
|
||||
generateDefaultConfigs(configPath)
|
||||
}
|
||||
|
||||
// Check if user has provided a file name
|
||||
|
Reference in New Issue
Block a user