From 1ac3b773a8ef1ba14f72a6f0b95dbe863c0ff32f Mon Sep 17 00:00:00 2001 From: Jguer Date: Wed, 5 Oct 2016 01:19:13 +0100 Subject: [PATCH] Outdated skip --- aur/aur.go | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/aur/aur.go b/aur/aur.go index c29e5eb..a46f8cf 100644 --- a/aur/aur.go +++ b/aur/aur.go @@ -226,13 +226,21 @@ func UpdatePackages(baseDir string, conf *alpm.PacmanConfig, flags string) error } } - // Install updated packages - fmt.Println("\033[1m\x1b[32m==> Proceed with upgrade\033[0m\033[1m (Y/n)\033[0m") - var response string - fmt.Scanln(&response) - if strings.ContainsAny(response, "n & N") { + //If there are no outdated packages, don't prompt + if len(outdated) == 0 { return nil } + + // Install updated packages + if !strings.Contains(flags, "noconfirm") { + fmt.Println("\033[1m\x1b[32m==> Proceed with upgrade\033[0m\033[1m (Y/n)\033[0m") + var response string + fmt.Scanln(&response) + if strings.ContainsAny(response, "n & N") { + return nil + } + } + for _, pkg := range outdated { Install(pkg, baseDir, conf, flags) } @@ -273,17 +281,17 @@ func (a *Result) Install(baseDir string, conf *alpm.PacmanConfig, flags string) dir.WriteString(a.Name) dir.WriteString("/") - if _, err := os.Stat(dir.String() + "PKGBUILD"); err == nil { - fmt.Println("\033[1m\x1b[32m==> Edit PKGBUILD?\033[0m\033[1m (y/N)\033[0m") - fmt.Scanln(&response) - if strings.ContainsAny(response, "y & Y") { - editcmd := exec.Command(Editor, dir.String()+"PKGBUILD") - editcmd.Stdout = os.Stdout - editcmd.Stderr = os.Stderr - editcmd.Stdin = os.Stdin - err = editcmd.Run() - } - } + if _, err := os.Stat(dir.String() + "PKGBUILD"); err == nil { + fmt.Println("\033[1m\x1b[32m==> Edit PKGBUILD?\033[0m\033[1m (y/N)\033[0m") + fmt.Scanln(&response) + if strings.ContainsAny(response, "y & Y") { + editcmd := exec.Command(Editor, dir.String()+"PKGBUILD") + editcmd.Stdout = os.Stdout + editcmd.Stderr = os.Stderr + editcmd.Stdin = os.Stdin + err = editcmd.Run() + } + } err = os.Chdir(dir.String()) if err != nil {