mirror/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-12-25 09:18:55 +00:00
Code Issues Releases Wiki Activity

rename opts to mainOpts

Browse source
This commit is contained in:
Alexander Neumann 2015-06-21 11:38:07 +02:00
parent a3e0907fc7
commit 2fa259816b
4 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/restic/cmd_cache.go
View file

@ -32,7 +32,7 @@ func (cmd CmdCache) Execute(args []string) error {
return err return err
} }
cache, err := restic.NewCache(s, opts.CacheDir) cache, err := restic.NewCache(s, mainOpts.CacheDir)
if err != nil { if err != nil {
return err return err
} }

8
cmd/restic/integration_helpers_test.go
View file

@ -177,11 +177,11 @@ type testEnvironment struct {
} }
func configureRestic(t testing.TB, cache, repo string) { func configureRestic(t testing.TB, cache, repo string) {
opts.CacheDir = cache mainOpts.CacheDir = cache
opts.Repo = repo mainOpts.Repo = repo
opts.Quiet = true mainOpts.Quiet = true
opts.password = TestPassword mainOpts.password = TestPassword
} }
func cleanupTempdir(t testing.TB, tempdir string) { func cleanupTempdir(t testing.TB, tempdir string) {

2
cmd/restic/integration_test.go
View file

@ -49,7 +49,7 @@ func cmdInit(t testing.TB) {
cmd := &CmdInit{} cmd := &CmdInit{}
OK(t, cmd.Execute(nil)) OK(t, cmd.Execute(nil))
t.Logf("repository initialized at %v", opts.Repo) t.Logf("repository initialized at %v", mainOpts.Repo)
} }
func cmdBackup(t testing.TB, target []string, parentID backend.ID) { func cmdBackup(t testing.TB, target []string, parentID backend.ID) {

38
cmd/restic/main.go
View file

@ -19,7 +19,7 @@ import (
var version = "compiled manually" var version = "compiled manually"
var opts struct { var mainOpts struct {
Repo string `short:"r" long:"repo" description:"Repository directory to backup to/restore from"` Repo string `short:"r" long:"repo" description:"Repository directory to backup to/restore from"`
CacheDir string ` long:"cache-dir" description:"Directory to use as a local cache"` CacheDir string ` long:"cache-dir" description:"Directory to use as a local cache"`
Quiet bool `short:"q" long:"quiet" default:"false" description:"Do not output comprehensive progress report"` Quiet bool `short:"q" long:"quiet" default:"false" description:"Do not output comprehensive progress report"`
@ -27,7 +27,7 @@ var opts struct {
password string password string
} }
var parser = flags.NewParser(&opts, flags.Default) var parser = flags.NewParser(&mainOpts, flags.Default)
func errx(code int, format string, data ...interface{}) { func errx(code int, format string, data ...interface{}) {
if len(format) > 0 && format[len(format)-1] != '\n' { if len(format) > 0 && format[len(format)-1] != '\n' {
@ -49,7 +49,7 @@ func readPassword(prompt string) string {
} }
func disableProgress() bool { func disableProgress() bool {
if opts.Quiet { if mainOpts.Quiet {
return true return true
} }
@ -61,7 +61,7 @@ func disableProgress() bool {
} }
func silenceRequested() bool { func silenceRequested() bool {
if opts.Quiet { if mainOpts.Quiet {
return true return true
} }
@ -79,11 +79,11 @@ func verbosePrintf(format string, args ...interface{}) {
type CmdInit struct{} type CmdInit struct{}
func (cmd CmdInit) Execute(args []string) error { func (cmd CmdInit) Execute(args []string) error {
if opts.Repo == "" { if mainOpts.Repo == "" {
return errors.New("Please specify repository location (-r)") return errors.New("Please specify repository location (-r)")
} }
if opts.password == "" { if mainOpts.password == "" {
pw := readPassword("enter password for new backend: ") pw := readPassword("enter password for new backend: ")
pw2 := readPassword("enter password again: ") pw2 := readPassword("enter password again: ")
@ -91,23 +91,23 @@ func (cmd CmdInit) Execute(args []string) error {
errx(1, "passwords do not match") errx(1, "passwords do not match")
} }
opts.password = pw mainOpts.password = pw
} }
be, err := create(opts.Repo) be, err := create(mainOpts.Repo)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "creating backend at %s failed: %v\n", opts.Repo, err) fmt.Fprintf(os.Stderr, "creating backend at %s failed: %v\n", mainOpts.Repo, err)
os.Exit(1) os.Exit(1)
} }
s := repository.New(be) s := repository.New(be)
err = s.Init(opts.password) err = s.Init(mainOpts.password)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "creating key in backend at %s failed: %v\n", opts.Repo, err) fmt.Fprintf(os.Stderr, "creating key in backend at %s failed: %v\n", mainOpts.Repo, err)
os.Exit(1) os.Exit(1)
} }
verbosePrintf("created restic backend %v at %s\n", s.Config.ID[:10], opts.Repo) verbosePrintf("created restic backend %v at %s\n", s.Config.ID[:10], mainOpts.Repo)
verbosePrintf("\n") verbosePrintf("\n")
verbosePrintf("Please note that knowledge of your password is required to access\n") verbosePrintf("Please note that knowledge of your password is required to access\n")
verbosePrintf("the repository. Losing your password means that your data is\n") verbosePrintf("the repository. Losing your password means that your data is\n")
@ -163,22 +163,22 @@ func create(u string) (backend.Backend, error) {
} }
func OpenRepo() (*repository.Repository, error) { func OpenRepo() (*repository.Repository, error) {
if opts.Repo == "" { if mainOpts.Repo == "" {
return nil, errors.New("Please specify repository location (-r)") return nil, errors.New("Please specify repository location (-r)")
} }
be, err := open(opts.Repo) be, err := open(mainOpts.Repo)
if err != nil { if err != nil {
return nil, err return nil, err
} }
s := repository.New(be) s := repository.New(be)
if opts.password == "" { if mainOpts.password == "" {
opts.password = readPassword("enter password for repository: ") mainOpts.password = readPassword("enter password for repository: ")
} }
err = s.SearchKey(opts.password) err = s.SearchKey(mainOpts.password)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to open repo: %v", err) return nil, fmt.Errorf("unable to open repo: %v", err)
} }
@ -202,8 +202,8 @@ func init() {
func main() { func main() {
// defer profile.Start(profile.MemProfileRate(100000), profile.ProfilePath(".")).Stop() // defer profile.Start(profile.MemProfileRate(100000), profile.ProfilePath(".")).Stop()
// defer profile.Start(profile.CPUProfile, profile.ProfilePath(".")).Stop() // defer profile.Start(profile.CPUProfile, profile.ProfilePath(".")).Stop()
opts.Repo = os.Getenv("RESTIC_REPOSITORY") mainOpts.Repo = os.Getenv("RESTIC_REPOSITORY")
opts.password = os.Getenv("RESTIC_PASSWORD") mainOpts.password = os.Getenv("RESTIC_PASSWORD")
debug.Log("restic", "main %#v", os.Args) debug.Log("restic", "main %#v", os.Args)