github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: use path/filepath instead of path for joining path parts

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-10-10 17:24:31 -04:00
committed by Jose Diaz-Gonzalez
parent ff7429fd00
commit 943e032d12
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/common/properties.go
View File

@@ -7,7 +7,7 @@ import (
"io/ioutil"
"os"
"os/user"
"path"
"path/filepath"
"reflect"
"strconv"
"strings"
@@ -447,17 +447,17 @@ func PropertySetup(pluginName string) error {
func getPropertyPath(pluginName string, appName string, property string) string {
pluginAppConfigRoot := getPluginAppPropertyPath(pluginName, appName)
return path.Join(pluginAppConfigRoot, property)
return filepath.Join(pluginAppConfigRoot, property)
}
// getPluginAppPropertyPath returns the plugin property path for a given plugin/app combination
func getPluginAppPropertyPath(pluginName string, appName string) string {
return path.Join(getPluginConfigPath(pluginName), appName)
return filepath.Join(getPluginConfigPath(pluginName), appName)
}
// getPluginConfigPath returns the plugin property path for a given plugin
func getPluginConfigPath(pluginName string) string {
return path.Join(MustGetEnv("DOKKU_LIB_ROOT"), "config", pluginName)
return filepath.Join(MustGetEnv("DOKKU_LIB_ROOT"), "config", pluginName)
}
// makePluginAppPropertyPath ensures that a property path exists