mirror of
https://github.com/minio/minio.git
synced 2025-04-20 10:37:31 -04:00
Merge pull request #1192 from harshavardhana/color
console: Fix console color printing on windows.
This commit is contained in:
commit
e883583804
@ -20,6 +20,7 @@ import (
|
|||||||
"runtime"
|
"runtime"
|
||||||
|
|
||||||
"github.com/minio/cli"
|
"github.com/minio/cli"
|
||||||
|
"github.com/minio/mc/pkg/console"
|
||||||
"github.com/minio/minio/pkg/probe"
|
"github.com/minio/minio/pkg/probe"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -106,17 +107,17 @@ func mainConfigLogger(ctx *cli.Context) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ctx.Args().Get(0) == "list" {
|
if ctx.Args().Get(0) == "list" {
|
||||||
Println(conf)
|
console.Println(conf)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func enableLog2Mongo(conf *config, args cli.Args) {
|
func enableLog2Mongo(conf *config, args cli.Args) {
|
||||||
if conf.IsFileLoggingEnabled() {
|
if conf.IsFileLoggingEnabled() {
|
||||||
Infoln("File logging already enabled. Removing automatically by enabling mongo.")
|
console.Infoln("File logging already enabled. Removing automatically by enabling mongo.")
|
||||||
conf.FileLogger.Filename = ""
|
conf.FileLogger.Filename = ""
|
||||||
}
|
}
|
||||||
if conf.IsSysloggingEnabled() {
|
if conf.IsSysloggingEnabled() {
|
||||||
Infoln("Syslog logging already enabled. Removing automatically by enabling mongo.")
|
console.Infoln("Syslog logging already enabled. Removing automatically by enabling mongo.")
|
||||||
conf.SyslogLogger.Addr = ""
|
conf.SyslogLogger.Addr = ""
|
||||||
conf.SyslogLogger.Network = ""
|
conf.SyslogLogger.Network = ""
|
||||||
}
|
}
|
||||||
@ -130,11 +131,11 @@ func enableLog2Mongo(conf *config, args cli.Args) {
|
|||||||
|
|
||||||
func enableLog2Syslog(conf *config, args cli.Args) {
|
func enableLog2Syslog(conf *config, args cli.Args) {
|
||||||
if conf.IsFileLoggingEnabled() {
|
if conf.IsFileLoggingEnabled() {
|
||||||
Infoln("File logging already enabled. Removing automatically by enabling syslog.")
|
console.Infoln("File logging already enabled. Removing automatically by enabling syslog.")
|
||||||
conf.FileLogger.Filename = ""
|
conf.FileLogger.Filename = ""
|
||||||
}
|
}
|
||||||
if conf.IsMongoLoggingEnabled() {
|
if conf.IsMongoLoggingEnabled() {
|
||||||
Infoln("Mongo logging already enabled. Removing automatically by enabling syslog.")
|
console.Infoln("Mongo logging already enabled. Removing automatically by enabling syslog.")
|
||||||
conf.MongoLogger.Addr = ""
|
conf.MongoLogger.Addr = ""
|
||||||
conf.MongoLogger.DB = ""
|
conf.MongoLogger.DB = ""
|
||||||
conf.MongoLogger.Collection = ""
|
conf.MongoLogger.Collection = ""
|
||||||
@ -147,12 +148,12 @@ func enableLog2Syslog(conf *config, args cli.Args) {
|
|||||||
|
|
||||||
func enableLog2File(conf *config, args cli.Args) {
|
func enableLog2File(conf *config, args cli.Args) {
|
||||||
if conf.IsSysloggingEnabled() {
|
if conf.IsSysloggingEnabled() {
|
||||||
Infoln("Syslog logging already enabled. Removing automatically by enabling file logging.")
|
console.Infoln("Syslog logging already enabled. Removing automatically by enabling file logging.")
|
||||||
conf.SyslogLogger.Addr = ""
|
conf.SyslogLogger.Addr = ""
|
||||||
conf.SyslogLogger.Network = ""
|
conf.SyslogLogger.Network = ""
|
||||||
}
|
}
|
||||||
if conf.IsMongoLoggingEnabled() {
|
if conf.IsMongoLoggingEnabled() {
|
||||||
Infoln("Mongo logging already enabled. Removing automatically by enabling file logging.")
|
console.Infoln("Mongo logging already enabled. Removing automatically by enabling file logging.")
|
||||||
conf.MongoLogger.Addr = ""
|
conf.MongoLogger.Addr = ""
|
||||||
conf.MongoLogger.DB = ""
|
conf.MongoLogger.DB = ""
|
||||||
conf.MongoLogger.Collection = ""
|
conf.MongoLogger.Collection = ""
|
||||||
|
@ -16,7 +16,10 @@
|
|||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import "github.com/minio/cli"
|
import (
|
||||||
|
"github.com/minio/cli"
|
||||||
|
"github.com/minio/mc/pkg/console"
|
||||||
|
)
|
||||||
|
|
||||||
// Print config version.
|
// Print config version.
|
||||||
var configVersionCmd = cli.Command{
|
var configVersionCmd = cli.Command{
|
||||||
@ -43,5 +46,5 @@ func mainConfigVersion(ctx *cli.Context) {
|
|||||||
// convert interface{} back to its original struct
|
// convert interface{} back to its original struct
|
||||||
newConf := config
|
newConf := config
|
||||||
type Version string
|
type Version string
|
||||||
Println(newConf.Version)
|
console.Println(newConf.Version)
|
||||||
}
|
}
|
||||||
|
170
console.go
170
console.go
@ -1,170 +0,0 @@
|
|||||||
/*
|
|
||||||
* Minio Cloud Storage, (C) 2015 Minio, Inc.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
"path/filepath"
|
|
||||||
)
|
|
||||||
|
|
||||||
type logLevel int
|
|
||||||
|
|
||||||
const (
|
|
||||||
levelPrint logLevel = iota + 1
|
|
||||||
levelDebug
|
|
||||||
levelInfo
|
|
||||||
levelError
|
|
||||||
levelFatal
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
mutex = &sync.RWMutex{}
|
|
||||||
|
|
||||||
// Fatal prints a error message and exits
|
|
||||||
Fatal = func(a ...interface{}) { privatePrint(levelFatal, a...) }
|
|
||||||
// Fatalln prints a error message with a new line and exits
|
|
||||||
Fatalln = func(a ...interface{}) { privatePrintln(levelFatal, a...) }
|
|
||||||
// Fatalf prints a error message with formatting and exits
|
|
||||||
Fatalf = func(f string, a ...interface{}) { privatePrintf(levelFatal, f, a...) }
|
|
||||||
|
|
||||||
// Error prints a error message
|
|
||||||
Error = func(a ...interface{}) { privatePrint(levelError, a...) }
|
|
||||||
// Errorln prints a error message with a new line
|
|
||||||
Errorln = func(a ...interface{}) { privatePrintln(levelError, a...) }
|
|
||||||
// Errorf prints a error message with formatting
|
|
||||||
Errorf = func(f string, a ...interface{}) { privatePrintf(levelError, f, a...) }
|
|
||||||
|
|
||||||
// Info prints a informational message
|
|
||||||
Info = func(a ...interface{}) { privatePrint(levelInfo, a...) }
|
|
||||||
// Infoln prints a informational message with a new line
|
|
||||||
Infoln = func(a ...interface{}) { privatePrintln(levelInfo, a...) }
|
|
||||||
// Infof prints a informational message with formatting
|
|
||||||
Infof = func(f string, a ...interface{}) { privatePrintf(levelInfo, f, a...) }
|
|
||||||
|
|
||||||
// Debug prints a debug message
|
|
||||||
Debug = func(a ...interface{}) { privatePrint(levelDebug, a...) }
|
|
||||||
// Debugln prints a debug message with a new line
|
|
||||||
Debugln = func(a ...interface{}) { privatePrintln(levelDebug, a...) }
|
|
||||||
// Debugf prints a debug message with formatting
|
|
||||||
Debugf = func(f string, a ...interface{}) { privatePrintf(levelDebug, f, a...) }
|
|
||||||
|
|
||||||
// Print prints a debug message
|
|
||||||
Print = func(a ...interface{}) { privatePrint(levelPrint, a...) }
|
|
||||||
// Println prints a debug message with a new line
|
|
||||||
Println = func(a ...interface{}) { privatePrintln(levelPrint, a...) }
|
|
||||||
// Printf prints a debug message with formatting
|
|
||||||
Printf = func(f string, a ...interface{}) { privatePrintf(levelPrint, f, a...) }
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
// print prints a message prefixed with message type and program name
|
|
||||||
privatePrint = func(l logLevel, a ...interface{}) {
|
|
||||||
switch l {
|
|
||||||
case levelDebug:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Fprint(os.Stderr, ProgramName()+": <DEBUG> ")
|
|
||||||
fmt.Fprint(os.Stderr, a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
case levelInfo:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Print(ProgramName() + ": <INFO> ")
|
|
||||||
fmt.Print(a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
case levelError:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Fprint(os.Stderr, ProgramName()+": <ERROR> ")
|
|
||||||
fmt.Fprint(os.Stderr, a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
case levelFatal:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Fprint(os.Stderr, ProgramName()+": <FATAL> ")
|
|
||||||
fmt.Fprint(os.Stderr, a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
os.Exit(1)
|
|
||||||
default:
|
|
||||||
fmt.Print(a...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// println - same as print with a new line
|
|
||||||
privatePrintln = func(l logLevel, a ...interface{}) {
|
|
||||||
switch l {
|
|
||||||
case levelDebug:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Fprint(os.Stderr, ProgramName()+": <DEBUG> ")
|
|
||||||
fmt.Fprintln(os.Stderr, a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
case levelInfo:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Print(ProgramName() + ": <INFO> ")
|
|
||||||
fmt.Println(a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
case levelError:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Fprint(os.Stderr, ProgramName()+": <ERROR> ")
|
|
||||||
fmt.Fprintln(os.Stderr, a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
case levelFatal:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Fprint(os.Stderr, ProgramName()+": <FATAL> ")
|
|
||||||
fmt.Fprintln(os.Stderr, a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
os.Exit(1)
|
|
||||||
default:
|
|
||||||
fmt.Println(a...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// printf - same as print, but takes a format specifier
|
|
||||||
privatePrintf = func(l logLevel, f string, a ...interface{}) {
|
|
||||||
switch l {
|
|
||||||
case levelDebug:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Fprint(os.Stderr, ProgramName()+": <DEBUG> ")
|
|
||||||
fmt.Fprintf(os.Stderr, f, a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
case levelInfo:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Print(ProgramName() + ": <INFO> ")
|
|
||||||
fmt.Printf(f, a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
case levelError:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Fprint(os.Stderr, ProgramName()+": <ERROR> ")
|
|
||||||
fmt.Fprintf(os.Stderr, f, a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
|
|
||||||
case levelFatal:
|
|
||||||
mutex.Lock()
|
|
||||||
fmt.Fprint(os.Stderr, ProgramName()+": <FATAL> ")
|
|
||||||
fmt.Fprintf(os.Stderr, f, a...)
|
|
||||||
mutex.Unlock()
|
|
||||||
os.Exit(1)
|
|
||||||
default:
|
|
||||||
fmt.Printf(f, a...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
// ProgramName - return the name of the executable program
|
|
||||||
func ProgramName() string {
|
|
||||||
_, progName := filepath.Split(os.Args[0])
|
|
||||||
return progName
|
|
||||||
}
|
|
11
main.go
11
main.go
@ -25,6 +25,7 @@ import (
|
|||||||
|
|
||||||
"github.com/dustin/go-humanize"
|
"github.com/dustin/go-humanize"
|
||||||
"github.com/minio/cli"
|
"github.com/minio/cli"
|
||||||
|
"github.com/minio/mc/pkg/console"
|
||||||
"github.com/minio/minio/pkg/probe"
|
"github.com/minio/minio/pkg/probe"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -59,7 +60,7 @@ func init() {
|
|||||||
// It is an unsafe practice to run network services as
|
// It is an unsafe practice to run network services as
|
||||||
// root. Containers are an exception.
|
// root. Containers are an exception.
|
||||||
if !isContainerized() && os.Geteuid() == 0 {
|
if !isContainerized() && os.Geteuid() == 0 {
|
||||||
Fatalln("Please run ‘minio’ as a non-root user.")
|
console.Fatalln("Please run ‘minio’ as a non-root user.")
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -140,7 +141,7 @@ func registerApp() *cli.App {
|
|||||||
app.Commands = commands
|
app.Commands = commands
|
||||||
app.CustomAppHelpTemplate = minioHelpTemplate
|
app.CustomAppHelpTemplate = minioHelpTemplate
|
||||||
app.CommandNotFound = func(ctx *cli.Context, command string) {
|
app.CommandNotFound = func(ctx *cli.Context, command string) {
|
||||||
msg := fmt.Sprintf("‘%s’ is not a minio sub-command. See ‘minio help’.", command)
|
msg := fmt.Sprintf("‘%s’ is not a minio sub-command. See ‘minio --help’.", command)
|
||||||
closestCommands := findClosestCommands(command)
|
closestCommands := findClosestCommands(command)
|
||||||
if len(closestCommands) > 0 {
|
if len(closestCommands) > 0 {
|
||||||
msg += fmt.Sprintf("\n\nDid you mean one of these?\n")
|
msg += fmt.Sprintf("\n\nDid you mean one of these?\n")
|
||||||
@ -148,7 +149,7 @@ func registerApp() *cli.App {
|
|||||||
msg += fmt.Sprintf(" ‘%s’\n", cmd)
|
msg += fmt.Sprintf(" ‘%s’\n", cmd)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Fatalln(msg)
|
console.Fatalln(msg)
|
||||||
}
|
}
|
||||||
return app
|
return app
|
||||||
}
|
}
|
||||||
@ -156,10 +157,10 @@ func registerApp() *cli.App {
|
|||||||
func checkMainSyntax(c *cli.Context) {
|
func checkMainSyntax(c *cli.Context) {
|
||||||
configPath, err := getConfigPath()
|
configPath, err := getConfigPath()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
Fatalf("Unable to obtain user's home directory. \nError: %s\n", err)
|
console.Fatalf("Unable to obtain user's home directory. \nError: %s\n", err)
|
||||||
}
|
}
|
||||||
if configPath == "" {
|
if configPath == "" {
|
||||||
Fatalf("Config folder cannot be empty, please specify --config-folder <foldername>.")
|
console.Fatalln("Config folder cannot be empty, please specify --config-folder <foldername>.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,6 +24,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/hashicorp/go-version"
|
"github.com/hashicorp/go-version"
|
||||||
|
"github.com/minio/mc/pkg/console"
|
||||||
)
|
)
|
||||||
|
|
||||||
// isContainerized returns true if we are inside a containerized environment.
|
// isContainerized returns true if we are inside a containerized environment.
|
||||||
@ -49,17 +50,17 @@ func checkGoVersion() {
|
|||||||
// Current version.
|
// Current version.
|
||||||
curVersion, e := version.NewVersion(runtime.Version()[2:])
|
curVersion, e := version.NewVersion(runtime.Version()[2:])
|
||||||
if e != nil {
|
if e != nil {
|
||||||
Fatalln("Unable to determine current go version.", e)
|
console.Fatalln("Unable to determine current go version.", e)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare version constraint.
|
// Prepare version constraint.
|
||||||
constraints, e := version.NewConstraint(minGoVersion)
|
constraints, e := version.NewConstraint(minGoVersion)
|
||||||
if e != nil {
|
if e != nil {
|
||||||
Fatalln("Unable to check go version.")
|
console.Fatalln("Unable to check go version.")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for minimum version.
|
// Check for minimum version.
|
||||||
if !constraints.Check(curVersion) {
|
if !constraints.Check(curVersion) {
|
||||||
Fatalln(fmt.Sprintf("Please recompile Minio with Golang version %s.", minGoVersion))
|
console.Fatalln(fmt.Sprintf("Please recompile Minio with Golang version %s.", minGoVersion))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,6 +25,7 @@ import (
|
|||||||
|
|
||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
"github.com/minio/go-homedir"
|
"github.com/minio/go-homedir"
|
||||||
|
"github.com/minio/mc/pkg/console"
|
||||||
"github.com/minio/minio/pkg/probe"
|
"github.com/minio/minio/pkg/probe"
|
||||||
"github.com/minio/minio/pkg/quick"
|
"github.com/minio/minio/pkg/quick"
|
||||||
)
|
)
|
||||||
@ -265,7 +266,7 @@ func migrateV1ToV2() {
|
|||||||
err = saveConfig(cv2)
|
err = saveConfig(cv2)
|
||||||
fatalIf(err.Trace(), "Unable to save config version ‘2’.", nil)
|
fatalIf(err.Trace(), "Unable to save config version ‘2’.", nil)
|
||||||
|
|
||||||
Println("Migration from version ‘1’ to ‘2’ completed successfully.")
|
console.Println("Migration from version ‘1’ to ‘2’ completed successfully.")
|
||||||
|
|
||||||
/// Purge old fsUsers.json file
|
/// Purge old fsUsers.json file
|
||||||
configPath, err := getConfigPath()
|
configPath, err := getConfigPath()
|
||||||
|
@ -29,6 +29,7 @@ import (
|
|||||||
|
|
||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
"github.com/minio/cli"
|
"github.com/minio/cli"
|
||||||
|
"github.com/minio/mc/pkg/console"
|
||||||
"github.com/minio/minio/pkg/minhttp"
|
"github.com/minio/minio/pkg/minhttp"
|
||||||
"github.com/minio/minio/pkg/probe"
|
"github.com/minio/minio/pkg/probe"
|
||||||
)
|
)
|
||||||
@ -138,9 +139,9 @@ func printServerMsg(serverConf *http.Server) {
|
|||||||
}
|
}
|
||||||
for _, host := range hosts {
|
for _, host := range hosts {
|
||||||
if serverConf.TLSConfig != nil {
|
if serverConf.TLSConfig != nil {
|
||||||
Printf(" https://%s:%s\n", host, port)
|
console.Printf(" https://%s:%s\n", host, port)
|
||||||
} else {
|
} else {
|
||||||
Printf(" http://%s:%s\n", host, port)
|
console.Printf(" http://%s:%s\n", host, port)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -232,8 +233,8 @@ func initServer() (*configV2, *probe.Error) {
|
|||||||
return nil, err.Trace()
|
return nil, err.Trace()
|
||||||
}
|
}
|
||||||
if conf != nil {
|
if conf != nil {
|
||||||
Println()
|
console.Println()
|
||||||
Println(accessKeys{conf})
|
console.Println(accessKeys{conf})
|
||||||
}
|
}
|
||||||
return conf, nil
|
return conf, nil
|
||||||
}
|
}
|
||||||
@ -310,20 +311,20 @@ func serverMain(c *cli.Context) {
|
|||||||
apiServer, err := configureServer(serverConfig)
|
apiServer, err := configureServer(serverConfig)
|
||||||
errorIf(err.Trace(), "Failed to configure API server.", nil)
|
errorIf(err.Trace(), "Failed to configure API server.", nil)
|
||||||
|
|
||||||
Println("\nMinio Object Storage:")
|
console.Println("\nMinio Object Storage:")
|
||||||
printServerMsg(apiServer)
|
printServerMsg(apiServer)
|
||||||
|
|
||||||
Println("\nMinio Browser:")
|
console.Println("\nMinio Browser:")
|
||||||
printServerMsg(apiServer)
|
printServerMsg(apiServer)
|
||||||
|
|
||||||
Println("\nTo configure Minio Client:")
|
console.Println("\nTo configure Minio Client:")
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" {
|
||||||
Println(" Download \"mc\" from https://dl.minio.io/client/mc/release/" + runtime.GOOS + "-" + runtime.GOARCH + "/mc.exe")
|
console.Println(" Download \"mc\" from https://dl.minio.io/client/mc/release/" + runtime.GOOS + "-" + runtime.GOARCH + "/mc.exe")
|
||||||
Println(" $ mc.exe config host add myminio http://localhost:9000 " + conf.Credentials.AccessKeyID + " " + conf.Credentials.SecretAccessKey)
|
console.Println(" $ mc.exe config host add myminio http://localhost:9000 " + conf.Credentials.AccessKeyID + " " + conf.Credentials.SecretAccessKey)
|
||||||
} else {
|
} else {
|
||||||
Println(" $ wget https://dl.minio.io/client/mc/release/" + runtime.GOOS + "-" + runtime.GOARCH + "/mc")
|
console.Println(" $ wget https://dl.minio.io/client/mc/release/" + runtime.GOOS + "-" + runtime.GOARCH + "/mc")
|
||||||
Println(" $ chmod 755 mc")
|
console.Println(" $ chmod 755 mc")
|
||||||
Println(" $ ./mc config host add myminio http://localhost:9000 " + conf.Credentials.AccessKeyID + " " + conf.Credentials.SecretAccessKey)
|
console.Println(" $ ./mc config host add myminio http://localhost:9000 " + conf.Credentials.AccessKeyID + " " + conf.Credentials.SecretAccessKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start server.
|
// Start server.
|
||||||
|
@ -27,6 +27,7 @@ import (
|
|||||||
|
|
||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
"github.com/minio/cli"
|
"github.com/minio/cli"
|
||||||
|
"github.com/minio/mc/pkg/console"
|
||||||
"github.com/minio/minio/pkg/probe"
|
"github.com/minio/minio/pkg/probe"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -183,7 +184,7 @@ func getReleaseUpdate(updateURL string) {
|
|||||||
if latest.After(current) {
|
if latest.After(current) {
|
||||||
updateMsg.Update = true
|
updateMsg.Update = true
|
||||||
}
|
}
|
||||||
Println(updateMsg)
|
console.Println(updateMsg)
|
||||||
}
|
}
|
||||||
|
|
||||||
// main entry point for update command.
|
// main entry point for update command.
|
||||||
|
202
vendor/github.com/minio/mc/LICENSE
generated
vendored
Normal file
202
vendor/github.com/minio/mc/LICENSE
generated
vendored
Normal file
@ -0,0 +1,202 @@
|
|||||||
|
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright [yyyy] [name of copyright owner]
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
9
vendor/github.com/minio/mc/NOTICE
generated
vendored
Normal file
9
vendor/github.com/minio/mc/NOTICE
generated
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
Minio Client (C) 2014, 2015 Minio, Inc.
|
||||||
|
|
||||||
|
This product includes software developed at Minio, Inc.
|
||||||
|
(https://minio.io/).
|
||||||
|
|
||||||
|
The Minio project contains unmodified/modified subcomponents too with
|
||||||
|
separate copyright notices and license terms. Your use of the source
|
||||||
|
code for the these subcomponents is subject to the terms and conditions
|
||||||
|
of the following licenses.
|
355
vendor/github.com/minio/mc/pkg/console/console.go
generated
vendored
Normal file
355
vendor/github.com/minio/mc/pkg/console/console.go
generated
vendored
Normal file
@ -0,0 +1,355 @@
|
|||||||
|
/*
|
||||||
|
* Minio Client (C) 2015 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package console
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"path/filepath"
|
||||||
|
|
||||||
|
"github.com/fatih/color"
|
||||||
|
"github.com/mattn/go-colorable"
|
||||||
|
"github.com/mattn/go-isatty"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
// DebugPrint enables/disables console debug printing.
|
||||||
|
DebugPrint = false
|
||||||
|
|
||||||
|
// Used by the caller to print multiple lines atomically. Exposed by Lock/Unlock methods.
|
||||||
|
publicMutex = &sync.Mutex{}
|
||||||
|
// Used internally by console.
|
||||||
|
privateMutex = &sync.Mutex{}
|
||||||
|
|
||||||
|
stderrColoredOutput = colorable.NewColorableStderr()
|
||||||
|
|
||||||
|
// Print prints a message.
|
||||||
|
Print = func(data ...interface{}) {
|
||||||
|
consolePrint("Print", Theme["Print"], data...)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// PrintC prints a message with color.
|
||||||
|
PrintC = func(data ...interface{}) {
|
||||||
|
consolePrint("PrintC", Theme["PrintC"], data...)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Printf prints a formatted message.
|
||||||
|
Printf = func(format string, data ...interface{}) {
|
||||||
|
consolePrintf("Print", Theme["Print"], format, data...)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Println prints a message with a newline.
|
||||||
|
Println = func(data ...interface{}) {
|
||||||
|
consolePrintln("Print", Theme["Print"], data...)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fatal print a error message and exit.
|
||||||
|
Fatal = func(data ...interface{}) {
|
||||||
|
consolePrint("Fatal", Theme["Fatal"], data...)
|
||||||
|
os.Exit(1)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fatalf print a error message with a format specified and exit.
|
||||||
|
Fatalf = func(format string, data ...interface{}) {
|
||||||
|
consolePrintf("Fatal", Theme["Fatal"], format, data...)
|
||||||
|
os.Exit(1)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fatalln print a error message with a new line and exit.
|
||||||
|
Fatalln = func(data ...interface{}) {
|
||||||
|
consolePrintln("Fatal", Theme["Fatal"], data...)
|
||||||
|
os.Exit(1)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Error prints a error message.
|
||||||
|
Error = func(data ...interface{}) {
|
||||||
|
consolePrint("Error", Theme["Error"], data...)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Errorf print a error message with a format specified.
|
||||||
|
Errorf = func(format string, data ...interface{}) {
|
||||||
|
consolePrintf("Error", Theme["Error"], format, data...)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Errorln prints a error message with a new line.
|
||||||
|
Errorln = func(data ...interface{}) {
|
||||||
|
consolePrintln("Error", Theme["Error"], data...)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Info prints a informational message.
|
||||||
|
Info = func(data ...interface{}) {
|
||||||
|
consolePrint("Info", Theme["Info"], data...)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Infof prints a informational message in custom format.
|
||||||
|
Infof = func(format string, data ...interface{}) {
|
||||||
|
consolePrintf("Info", Theme["Info"], format, data...)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Infoln prints a informational message with a new line.
|
||||||
|
Infoln = func(data ...interface{}) {
|
||||||
|
consolePrintln("Info", Theme["Info"], data...)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Debug prints a debug message without a new line
|
||||||
|
// Debug prints a debug message.
|
||||||
|
Debug = func(data ...interface{}) {
|
||||||
|
if DebugPrint {
|
||||||
|
consolePrint("Debug", Theme["Debug"], data...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Debugf prints a debug message with a new line.
|
||||||
|
Debugf = func(format string, data ...interface{}) {
|
||||||
|
if DebugPrint {
|
||||||
|
consolePrintf("Debug", Theme["Debug"], format, data...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Debugln prints a debug message with a new line.
|
||||||
|
Debugln = func(data ...interface{}) {
|
||||||
|
if DebugPrint {
|
||||||
|
consolePrintln("Debug", Theme["Debug"], data...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Colorize prints message in a colorized form, dictated by the corresponding tag argument.
|
||||||
|
Colorize = func(tag string, data interface{}) string {
|
||||||
|
if isatty.IsTerminal(os.Stdout.Fd()) {
|
||||||
|
colorized, ok := Theme[tag]
|
||||||
|
if ok {
|
||||||
|
return colorized.SprintFunc()(data)
|
||||||
|
} // else: No theme found. Return as string.
|
||||||
|
}
|
||||||
|
return fmt.Sprint(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Eraseline Print in new line and adjust to top so that we don't print over the ongoing progress bar.
|
||||||
|
Eraseline = func() {
|
||||||
|
consolePrintf("Print", Theme["Print"], "%c[2K\n", 27)
|
||||||
|
consolePrintf("Print", Theme["Print"], "%c[A", 27)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// wrap around standard fmt functions.
|
||||||
|
// consolePrint prints a message prefixed with message type and program name.
|
||||||
|
func consolePrint(tag string, c *color.Color, a ...interface{}) {
|
||||||
|
privateMutex.Lock()
|
||||||
|
defer privateMutex.Unlock()
|
||||||
|
|
||||||
|
switch tag {
|
||||||
|
case "Debug":
|
||||||
|
// if no arguments are given do not invoke debug printer.
|
||||||
|
if len(a) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
output := color.Output
|
||||||
|
color.Output = stderrColoredOutput
|
||||||
|
if isatty.IsTerminal(os.Stderr.Fd()) {
|
||||||
|
c.Print(ProgramName() + ": <DEBUG> ")
|
||||||
|
c.Print(a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprint(color.Output, ProgramName()+": <DEBUG> ")
|
||||||
|
fmt.Fprint(color.Output, a...)
|
||||||
|
}
|
||||||
|
color.Output = output
|
||||||
|
case "Fatal":
|
||||||
|
fallthrough
|
||||||
|
case "Error":
|
||||||
|
// if no arguments are given do not invoke fatal and error printer.
|
||||||
|
if len(a) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
output := color.Output
|
||||||
|
color.Output = stderrColoredOutput
|
||||||
|
if isatty.IsTerminal(os.Stderr.Fd()) {
|
||||||
|
c.Print(ProgramName() + ": <ERROR> ")
|
||||||
|
c.Print(a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprint(color.Output, ProgramName()+": <ERROR> ")
|
||||||
|
fmt.Fprint(color.Output, a...)
|
||||||
|
}
|
||||||
|
color.Output = output
|
||||||
|
case "Info":
|
||||||
|
// if no arguments are given do not invoke info printer.
|
||||||
|
if len(a) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if isatty.IsTerminal(os.Stdout.Fd()) {
|
||||||
|
c.Print(ProgramName() + ": ")
|
||||||
|
c.Print(a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprint(color.Output, ProgramName()+": ")
|
||||||
|
fmt.Fprint(color.Output, a...)
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
if isatty.IsTerminal(os.Stdout.Fd()) {
|
||||||
|
c.Print(a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprint(color.Output, a...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// consolePrintf - same as print with a new line.
|
||||||
|
func consolePrintf(tag string, c *color.Color, format string, a ...interface{}) {
|
||||||
|
privateMutex.Lock()
|
||||||
|
defer privateMutex.Unlock()
|
||||||
|
|
||||||
|
switch tag {
|
||||||
|
case "Debug":
|
||||||
|
// if no arguments are given do not invoke debug printer.
|
||||||
|
if len(a) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
output := color.Output
|
||||||
|
color.Output = stderrColoredOutput
|
||||||
|
if isatty.IsTerminal(os.Stderr.Fd()) {
|
||||||
|
c.Print(ProgramName() + ": <DEBUG> ")
|
||||||
|
c.Printf(format, a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprint(color.Output, ProgramName()+": <DEBUG> ")
|
||||||
|
fmt.Fprintf(color.Output, format, a...)
|
||||||
|
}
|
||||||
|
color.Output = output
|
||||||
|
case "Fatal":
|
||||||
|
fallthrough
|
||||||
|
case "Error":
|
||||||
|
// if no arguments are given do not invoke fatal and error printer.
|
||||||
|
if len(a) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
output := color.Output
|
||||||
|
color.Output = stderrColoredOutput
|
||||||
|
if isatty.IsTerminal(os.Stderr.Fd()) {
|
||||||
|
c.Print(ProgramName() + ": <ERROR> ")
|
||||||
|
c.Printf(format, a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprint(color.Output, ProgramName()+": <ERROR> ")
|
||||||
|
fmt.Fprintf(color.Output, format, a...)
|
||||||
|
}
|
||||||
|
color.Output = output
|
||||||
|
case "Info":
|
||||||
|
// if no arguments are given do not invoke info printer.
|
||||||
|
if len(a) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if isatty.IsTerminal(os.Stdout.Fd()) {
|
||||||
|
c.Print(ProgramName() + ": ")
|
||||||
|
c.Printf(format, a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprint(color.Output, ProgramName()+": ")
|
||||||
|
fmt.Fprintf(color.Output, format, a...)
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
if isatty.IsTerminal(os.Stdout.Fd()) {
|
||||||
|
c.Printf(format, a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprintf(color.Output, format, a...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// consolePrintln - same as print with a new line.
|
||||||
|
func consolePrintln(tag string, c *color.Color, a ...interface{}) {
|
||||||
|
privateMutex.Lock()
|
||||||
|
defer privateMutex.Unlock()
|
||||||
|
|
||||||
|
switch tag {
|
||||||
|
case "Debug":
|
||||||
|
// if no arguments are given do not invoke debug printer.
|
||||||
|
if len(a) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
output := color.Output
|
||||||
|
color.Output = stderrColoredOutput
|
||||||
|
if isatty.IsTerminal(os.Stderr.Fd()) {
|
||||||
|
c.Print(ProgramName() + ": <DEBUG> ")
|
||||||
|
c.Println(a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprint(color.Output, ProgramName()+": <DEBUG> ")
|
||||||
|
fmt.Fprintln(color.Output, a...)
|
||||||
|
}
|
||||||
|
color.Output = output
|
||||||
|
case "Fatal":
|
||||||
|
fallthrough
|
||||||
|
case "Error":
|
||||||
|
// if no arguments are given do not invoke fatal and error printer.
|
||||||
|
if len(a) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
output := color.Output
|
||||||
|
color.Output = stderrColoredOutput
|
||||||
|
if isatty.IsTerminal(os.Stderr.Fd()) {
|
||||||
|
c.Print(ProgramName() + ": <ERROR> ")
|
||||||
|
c.Println(a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprint(color.Output, ProgramName()+": <ERROR> ")
|
||||||
|
fmt.Fprintln(color.Output, a...)
|
||||||
|
}
|
||||||
|
color.Output = output
|
||||||
|
case "Info":
|
||||||
|
// if no arguments are given do not invoke info printer.
|
||||||
|
if len(a) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if isatty.IsTerminal(os.Stdout.Fd()) {
|
||||||
|
c.Print(ProgramName() + ": ")
|
||||||
|
c.Println(a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprint(color.Output, ProgramName()+": ")
|
||||||
|
fmt.Fprintln(color.Output, a...)
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
if isatty.IsTerminal(os.Stdout.Fd()) {
|
||||||
|
c.Println(a...)
|
||||||
|
} else {
|
||||||
|
fmt.Fprintln(color.Output, a...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lock console.
|
||||||
|
func Lock() {
|
||||||
|
publicMutex.Lock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unlock locked console.
|
||||||
|
func Unlock() {
|
||||||
|
publicMutex.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ProgramName - return the name of the executable program.
|
||||||
|
func ProgramName() string {
|
||||||
|
_, progName := filepath.Split(os.Args[0])
|
||||||
|
return progName
|
||||||
|
}
|
53
vendor/github.com/minio/mc/pkg/console/themes.go
generated
vendored
Normal file
53
vendor/github.com/minio/mc/pkg/console/themes.go
generated
vendored
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
/*
|
||||||
|
* Minio Client (C) 2015 Minio, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package console
|
||||||
|
|
||||||
|
import "github.com/fatih/color"
|
||||||
|
|
||||||
|
var (
|
||||||
|
// Theme contains default color mapping.
|
||||||
|
Theme = map[string]*color.Color{
|
||||||
|
"Debug": color.New(color.FgWhite, color.Faint, color.Italic),
|
||||||
|
"Fatal": color.New(color.FgRed, color.Italic, color.Bold),
|
||||||
|
"Error": color.New(color.FgYellow, color.Italic),
|
||||||
|
"Info": color.New(color.FgGreen, color.Bold),
|
||||||
|
"Print": color.New(),
|
||||||
|
"PrintC": color.New(color.FgGreen, color.Bold),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// SetColorOff disables coloring for the entire session.
|
||||||
|
func SetColorOff() {
|
||||||
|
privateMutex.Lock()
|
||||||
|
defer privateMutex.Unlock()
|
||||||
|
color.NoColor = true
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetColorOn enables coloring for the entire session.
|
||||||
|
func SetColorOn() {
|
||||||
|
privateMutex.Lock()
|
||||||
|
defer privateMutex.Unlock()
|
||||||
|
color.NoColor = false
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetColor sets a color for a particular tag.
|
||||||
|
func SetColor(tag string, cl *color.Color) {
|
||||||
|
privateMutex.Lock()
|
||||||
|
defer privateMutex.Unlock()
|
||||||
|
// add new theme
|
||||||
|
Theme[tag] = cl
|
||||||
|
}
|
5
vendor/vendor.json
vendored
5
vendor/vendor.json
vendored
@ -82,6 +82,11 @@
|
|||||||
"revision": "0b1069c753c94b3633cc06a1995252dbcc27c7a6",
|
"revision": "0b1069c753c94b3633cc06a1995252dbcc27c7a6",
|
||||||
"revisionTime": "2016-02-15T17:25:11+05:30"
|
"revisionTime": "2016-02-15T17:25:11+05:30"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"path": "github.com/minio/mc/pkg/console",
|
||||||
|
"revision": "db6b4f13442b26995f04b3b2b31b006cae7786e6",
|
||||||
|
"revisionTime": "2016-02-29T08:42:30-08:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "github.com/minio/minio-go",
|
"path": "github.com/minio/minio-go",
|
||||||
"revision": "280f16a52008d3ebba1bd64398b9b082e6738386",
|
"revision": "280f16a52008d3ebba1bd64398b9b082e6738386",
|
||||||
|
@ -17,9 +17,8 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/minio/cli"
|
"github.com/minio/cli"
|
||||||
|
"github.com/minio/mc/pkg/console"
|
||||||
)
|
)
|
||||||
|
|
||||||
var versionCmd = cli.Command{
|
var versionCmd = cli.Command{
|
||||||
@ -34,11 +33,8 @@ USAGE:
|
|||||||
`,
|
`,
|
||||||
}
|
}
|
||||||
|
|
||||||
func mainVersion(ctxx *cli.Context) {
|
func mainVersion(ctx *cli.Context) {
|
||||||
Println("Version: " + minioVersion)
|
console.Println("Version: " + minioVersion)
|
||||||
Println("Release-Tag: " + minioReleaseTag)
|
console.Println("Release-Tag: " + minioReleaseTag)
|
||||||
Println("Commit-ID: " + minioCommitID)
|
console.Println("Commit-ID: " + minioCommitID)
|
||||||
if os.Getenv("DOCKERIMAGE") == "1" {
|
|
||||||
Println("Docker-Image: " + "true")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user