From 60ac1b932f5de2cdeb0d923a2280f5eb1e05b4d4 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 22 Oct 2015 11:34:00 -0700 Subject: [PATCH] Simplify serveFrameworkArtifact with library function for basenames --- contrib/mesos/pkg/scheduler/service/service.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go index 935bec0eba..72955adc26 100644 --- a/contrib/mesos/pkg/scheduler/service/service.go +++ b/contrib/mesos/pkg/scheduler/service/service.go @@ -295,15 +295,7 @@ func (s *SchedulerServer) AddHyperkubeFlags(fs *pflag.FlagSet) { // returns (downloadURI, basename(path)) func (s *SchedulerServer) serveFrameworkArtifact(path string) (string, string) { - pathSplit := strings.Split(path, "/") - - var basename string - if len(pathSplit) > 0 { - basename = pathSplit[len(pathSplit)-1] - } else { - basename = path - } - + basename := filepath.Base(path) return s.serveFrameworkArtifactWithFilename(path, basename), basename }