diff --git a/app/cmd/center_download.go b/app/cmd/center_download.go index 55bdbd3882f58830208c0d1fe5a07c3ba813943c..db1b9b5f6f9736133b60b898ab7b381cd5fdc758 100644 --- a/app/cmd/center_download.go +++ b/app/cmd/center_download.go @@ -2,6 +2,7 @@ package cmd import ( "fmt" + "go.uber.org/zap" "net/http" "os" "path/filepath" @@ -73,6 +74,9 @@ func (c *CenterDownloadOption) DownloadJenkins() (err error) { ShowProgress: c.ShowProgress, } + jenkinsWarURL := jClient.GetJenkinsWarURL() + logger.Info("prepare to download jenkins.war", zap.String("URL", jenkinsWarURL)) + err = jClient.DownloadJenkins() return } diff --git a/app/cmd/center_start.go b/app/cmd/center_start.go index 3d1ef766253156b25ffe922a5c4a8df7dce47ce8..a294887d603bf36fe4c7f5822981b8b04f665aa2 100644 --- a/app/cmd/center_start.go +++ b/app/cmd/center_start.go @@ -2,6 +2,7 @@ package cmd import ( "fmt" + "go.uber.org/zap" "os" "github.com/jenkins-zh/jenkins-cli/app/i18n" @@ -35,6 +36,7 @@ type CenterStartOption struct { Download bool Version string + LTS bool DryRun bool } @@ -60,6 +62,8 @@ func init() { i18n.T("If you want to download jenkins.war when it does not exist")) centerStartCmd.Flags().StringVarP(¢erStartOption.Version, "version", "", "2.190.3", i18n.T("The of version of jenkins.war")) + centerStartCmd.Flags().BoolVarP(¢erStartOption.LTS, "lts", "", true, + i18n.T("If you want to download Jenkins as LTS")) centerStartCmd.Flags().BoolVarP(¢erStartOption.HTTPSEnable, "https-enable", "", false, i18n.T("If you want to enable https")) @@ -89,11 +93,13 @@ var centerStartCmd = &cobra.Command{ jenkinsWar := fmt.Sprintf("%s/.jenkins-cli/cache/%s/jenkins.war", userHome, centerStartOption.Version) + logger.Info("prepare to download jenkins.war", zap.String("localPath", jenkinsWar)) + if !centerStartOption.DryRun { if _, fileErr := os.Stat(jenkinsWar); fileErr != nil { download := &CenterDownloadOption{ Mirror: "default", - LTS: true, + LTS: centerStartOption.LTS, Output: jenkinsWar, ShowProgress: true, Version: centerStartOption.Version,