Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: switch to path.Join

Browse Source 
This is the _correct_ way to join paths in golang
This commit is contained in:
Jose Diaz-Gonzalez
2019-01-21 18:23:45 -05:00
parent 884c45de0c
commit a56ae22614
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/common/properties.go
View File

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