rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to newest pkglib

Browse source
This commit is contained in:
Tom Wiesing 2023-04-09 22:00:24 +02:00
parent 1bdcb6e3b4
commit 7ff2ecf7fe
No known key found for this signature in database
11 changed files with 95 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/config/paths.go
View file

@ -45,8 +45,12 @@ func (pcfg PathsConfig) UsingDistilleryExecutable() bool {
// When it does not exist, falls back to the default executable.
func (pcfg PathsConfig) CurrentExecutable() string {
exe, err := os.Executable()
if err != nil || !fsx.IsRegular(exe) {
return pcfg.ExecutablePath()
if err == nil {
isFile, err := fsx.IsRegular(exe, true)
if err == nil && isFile {
return exe
}
}
return exe
return pcfg.ExecutablePath()
}

12
internal/config/validators/files.go
View file

@ -9,7 +9,11 @@ func ValidateFile(path *string, dflt string) error {
if *path == "" {
*path = dflt
}
if !fsx.IsRegular(*path) {
isFile, err := fsx.IsRegular(*path, true)
if err != nil {
return err
}
if !isFile {
return errors.Errorf("%q does not exist or is not a file", *path)
}
return nil
@ -19,7 +23,11 @@ func ValidateDirectory(path *string, dflt string) error {
if *path == "" {
*path = dflt
}
if !fsx.IsDirectory(*path) {
isDirectory, err := fsx.IsDirectory(*path, true)
if err != nil {
return err
}
if !isDirectory {
return errors.Errorf("%q does not exist or is not a directory", *path)
}
return nil