Merge pull request #1829 from gibmat/extend-minio-client-naming

Extend minio client naming

Author: stgraber

internal/server/storage/s3/miniod/admin_client.go

@@ -101,11 +101,13 @@ func (c *AdminClient) isMinIOClient() bool {
 		return false
 	}
 
-	if !strings.Contains(lines[0], "mc version") && !strings.Contains(lines[0], "mcli version") {
-		return false
+	for _, name := range []string{"miniocli", "minioc", "mcli", "minio-client", "mc"} {
+		if strings.Contains(lines[0], name+" version") {
+			return true
+		}
 	}
 
-	return true
+	return false
 }
 
 // ServiceStop stops the MinIO cluster.

internal/server/storage/s3/miniod/miniod.go

@@ -70,7 +70,7 @@ func (p *Process) AdminUser() string {
 func (p *Process) AdminClient() (*AdminClient, error) {
 	var binaryName string
 
-	for _, name := range []string{"miniocli", "minioc", "mcli", "mc"} {
+	for _, name := range []string{"miniocli", "minioc", "mcli", "minio-client", "mc"} {
 		_, err := exec.LookPath(name)
 		if err == nil {
 			binaryName = name