Commit 0d464cac authored by tcharding's avatar tcharding

Rename XDGDataPluginLoader to be uniform

parent 91eaa8a3
...@@ -183,7 +183,7 @@ func (f *ring2Factory) PluginLoader() plugins.PluginLoader { ...@@ -183,7 +183,7 @@ func (f *ring2Factory) PluginLoader() plugins.PluginLoader {
return plugins.KubectlPluginsPathPluginLoader() return plugins.KubectlPluginsPathPluginLoader()
} }
return plugins.TolerantMultiPluginLoader{ return plugins.TolerantMultiPluginLoader{
plugins.XDGDataPluginLoader(), plugins.XDGDataDirsPluginLoader(),
plugins.UserDirPluginLoader(), plugins.UserDirPluginLoader(),
} }
} }
......
...@@ -143,11 +143,11 @@ func KubectlPluginsPathPluginLoader() PluginLoader { ...@@ -143,11 +143,11 @@ func KubectlPluginsPathPluginLoader() PluginLoader {
return PathFromEnvVarPluginLoader("KUBECTL_PLUGINS_PATH") return PathFromEnvVarPluginLoader("KUBECTL_PLUGINS_PATH")
} }
// XDGDataPluginLoader returns a PluginLoader that loads plugins from one or more // XDGDataDirsPluginLoader returns a PluginLoader that loads plugins from one or more
// directories specified by the XDG system directory structure spec in the // directories specified by the XDG system directory structure spec in the
// XDG_DATA_DIRS env var, plus the "kubectl/plugins/" suffix. According to the // XDG_DATA_DIRS env var, plus the "kubectl/plugins/" suffix. According to the
// spec, if XDG_DATA_DIRS is not set it defaults to "/usr/local/share:/usr/share". // spec, if XDG_DATA_DIRS is not set it defaults to "/usr/local/share:/usr/share".
func XDGDataPluginLoader() PluginLoader { func XDGDataDirsPluginLoader() PluginLoader {
envVarName := "XDG_DATA_DIRS" envVarName := "XDG_DATA_DIRS"
if len(os.Getenv(envVarName)) > 0 { if len(os.Getenv(envVarName)) > 0 {
return PathFromEnvVarPluginLoader(envVarName, "kubectl", "plugins") return PathFromEnvVarPluginLoader(envVarName, "kubectl", "plugins")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment