github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify serveFrameworkArtifact with library function for basenames

pull/6/head
Dr. Stefan Schimanski 2015-10-22 11:34:00 -07:00
parent 4062e2be2f
commit 60ac1b932f
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/mesos/pkg/scheduler/service/service.go
View File

@ -295,15 +295,7 @@ func (s *SchedulerServer) AddHyperkubeFlags(fs *pflag.FlagSet) {
// returns (downloadURI, basename(path)) // returns (downloadURI, basename(path))
func (s *SchedulerServer) serveFrameworkArtifact(path string) (string, string) { func (s *SchedulerServer) serveFrameworkArtifact(path string) (string, string) {
pathSplit := strings.Split(path, "/") basename := filepath.Base(path)
var basename string
if len(pathSplit) > 0 {
basename = pathSplit[len(pathSplit)-1]
} else {
basename = path
}
return s.serveFrameworkArtifactWithFilename(path, basename), basename return s.serveFrameworkArtifactWithFilename(path, basename), basename
} }