From 004595a396438867bdc3f7bba0dc72eca43aa951 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Thu, 30 Aug 2018 15:30:52 +0100 Subject: [PATCH] Dont rm directories with -G unless using -f --- download.go | 37 +++++++++++++++++++++++++++++++++---- parser.go | 2 +- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/download.go b/download.go index c93fbf9b..37747c9b 100644 --- a/download.go +++ b/download.go @@ -158,9 +158,29 @@ func getPkgbuilds(pkgs []string) error { } if len(aur) > 0 { - bases := getBases(info) - toSkip := pkgbuildsToSkip(bases, nil) - if _, err = downloadPkgbuilds(bases, toSkip, wd); err != nil { + allBases := getBases(info) + bases := make([]Base, 0) + + for _, base := range allBases { + name := base.Pkgbase() + _, err = os.Stat(filepath.Join(wd, name)) + if err != nil && !os.IsNotExist(err) { + fmt.Println(bold(red(smallArrow)), err) + continue + } else if os.IsNotExist(err) || cmdArgs.existsArg("f", "force") || shouldUseGit(filepath.Join(wd, name)) { + if err = os.RemoveAll(filepath.Join(wd, name)); err != nil { + fmt.Println(bold(red(smallArrow)), err) + continue + } + } else { + fmt.Printf("%s %s %s\n", yellow(smallArrow), cyan(name), "already downloaded -- use -f to overwrite") + continue + } + + bases = append(bases, base) + } + + if _, err = downloadPkgbuilds(bases, nil, wd); err != nil { return err } @@ -227,9 +247,18 @@ func getPkgbuildsfromABS(pkgs []string, path string) (bool, error) { continue } - if err = os.RemoveAll(filepath.Join(path, name)); err != nil { + _, err = os.Stat(filepath.Join(path, name)) + if err != nil && !os.IsNotExist(err) { fmt.Println(bold(red(smallArrow)), err) continue + } else if os.IsNotExist(err) || cmdArgs.existsArg("f", "force") { + if err = os.RemoveAll(filepath.Join(path, name)); err != nil { + fmt.Println(bold(red(smallArrow)), err) + continue + } + } else { + fmt.Printf("%s %s %s\n", yellow(smallArrow), cyan(name), "already downloaded -- use -f to overwrite") + continue } names[name] = url diff --git a/parser.go b/parser.go index 6cbdcf00..1c1ccd86 100644 --- a/parser.go +++ b/parser.go @@ -389,7 +389,7 @@ func isArg(arg string) bool { case "ignoregroup": case "needed": case "overwrite": - case "force": + case "f", "force": case "c", "changelog": case "deps": case "e", "explicit":