Merge pull request #30 from LinuxSuRen/fix/err-when-generate-config

Fix the error of generate sample config file when no config file is exist

app/cmd/config.go

@@ -65,6 +65,7 @@ var configCmd = &cobra.Command{
 		if configOptions.Generate {
 			if data, err := generateSampleConfig(); err == nil {
 				fmt.Print(string(data))
+				fmt.Printf("# Goto 'http://localhost:8080/jenkins/me/configure', then you can generate your token.")
 			} else {
 				log.Fatal(err)
 			}
@@ -203,11 +204,14 @@ func removeJenkins(name string) (err error) {
 	return
 }
 
-func loadDefaultConfig() {
+func loadDefaultConfig() (err error) {
 	userHome := userHomeDir()
-	if err := loadConfig(fmt.Sprintf("%s/.jenkins-cli.yaml", userHome)); err != nil {
-		log.Fatalf("error: %v", err)
+	configPath := fmt.Sprintf("%s/.jenkins-cli.yaml", userHome)
+	if _, err = os.Stat(configPath); err == nil {
+		err = loadConfig(configPath)
 	}
+
+	return
 }
 
 func loadConfig(path string) (err error) {

app/cmd/root.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"log"
 	"os"
 
 	"github.com/linuxsuren/jenkins-cli/app"
@@ -51,5 +52,12 @@ func init() {
 }
 
 func initConfig() {
-	loadDefaultConfig()
+	if err := loadDefaultConfig(); err != nil {
+		if os.IsNotExist(err) {
+			log.Printf("No config file found.")
+			return
+		}
+
+		log.Fatalf("Config file is invalid: %v", err)
+	}
 }