diff --git a/cmd/restic/cmd_autocomplete.go b/cmd/restic/cmd_autocomplete.go index 881b9ca0e..420b4e1b9 100644 --- a/cmd/restic/cmd_autocomplete.go +++ b/cmd/restic/cmd_autocomplete.go @@ -19,6 +19,7 @@ for convenience, and the command may need superuser rights, e.g.: $ sudo restic autocomplete`, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { if err := cmdRoot.GenBashCompletionFile(autocompleteTarget); err != nil { return err diff --git a/cmd/restic/cmd_backup.go b/cmd/restic/cmd_backup.go index 6921bc53e..ba22a07cf 100644 --- a/cmd/restic/cmd_backup.go +++ b/cmd/restic/cmd_backup.go @@ -37,6 +37,7 @@ given as the arguments. backupOptions.Hostname = hostname } }, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { if backupOptions.Stdin && backupOptions.FilesFrom == "-" { return errors.Fatal("cannot use both `--stdin` and `--files-from -`") diff --git a/cmd/restic/cmd_cat.go b/cmd/restic/cmd_cat.go index a7f15e75b..33a559b35 100644 --- a/cmd/restic/cmd_cat.go +++ b/cmd/restic/cmd_cat.go @@ -20,6 +20,7 @@ var cmdCat = &cobra.Command{ Long: ` The "cat" command is used to print internal objects to stdout. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runCat(globalOptions, args) }, diff --git a/cmd/restic/cmd_check.go b/cmd/restic/cmd_check.go index c0575ade3..b59d55a42 100644 --- a/cmd/restic/cmd_check.go +++ b/cmd/restic/cmd_check.go @@ -20,6 +20,7 @@ var cmdCheck = &cobra.Command{ The "check" command tests the repository for errors and reports any errors it finds. It can also be used to read all data and therefore simulate a restore. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runCheck(checkOptions, globalOptions, args) }, diff --git a/cmd/restic/cmd_dump.go b/cmd/restic/cmd_dump.go index 56d5426b6..038d87d9c 100644 --- a/cmd/restic/cmd_dump.go +++ b/cmd/restic/cmd_dump.go @@ -25,6 +25,7 @@ var cmdDump = &cobra.Command{ Long: ` The "dump" command dumps data structures from the repository as JSON objects. It is used for debugging purposes only.`, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runDump(globalOptions, args) }, diff --git a/cmd/restic/cmd_find.go b/cmd/restic/cmd_find.go index 3b4860eb4..2eb8be112 100644 --- a/cmd/restic/cmd_find.go +++ b/cmd/restic/cmd_find.go @@ -20,6 +20,7 @@ var cmdFind = &cobra.Command{ Long: ` The "find" command searches for files or directories in snapshots stored in the repo. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runFind(findOptions, globalOptions, args) }, diff --git a/cmd/restic/cmd_forget.go b/cmd/restic/cmd_forget.go index 68cfe5926..cb230944a 100644 --- a/cmd/restic/cmd_forget.go +++ b/cmd/restic/cmd_forget.go @@ -18,6 +18,7 @@ The "forget" command removes snapshots according to a policy. Please note that this command really only deletes the snapshot object in the repository, which is a reference to data stored there. In order to remove this (now unreferenced) data after 'forget' was run successfully, see the 'prune' command. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runForget(forgetOptions, globalOptions, args) }, diff --git a/cmd/restic/cmd_init.go b/cmd/restic/cmd_init.go index 368cadb88..cc4dae3ae 100644 --- a/cmd/restic/cmd_init.go +++ b/cmd/restic/cmd_init.go @@ -15,6 +15,7 @@ var cmdInit = &cobra.Command{ Long: ` The "init" command initializes a new repository. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runInit(globalOptions, args) }, diff --git a/cmd/restic/cmd_key.go b/cmd/restic/cmd_key.go index 5e7ccf35c..876408e85 100644 --- a/cmd/restic/cmd_key.go +++ b/cmd/restic/cmd_key.go @@ -17,6 +17,7 @@ var cmdKey = &cobra.Command{ Long: ` The "key" command manages keys (passwords) for accessing the repository. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runKey(globalOptions, args) }, diff --git a/cmd/restic/cmd_list.go b/cmd/restic/cmd_list.go index 99cad1a98..5bdde1d81 100644 --- a/cmd/restic/cmd_list.go +++ b/cmd/restic/cmd_list.go @@ -17,6 +17,7 @@ var cmdList = &cobra.Command{ Long: ` The "list" command allows listing objects in the repository based on type. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runList(globalOptions, args) }, diff --git a/cmd/restic/cmd_ls.go b/cmd/restic/cmd_ls.go index d6e8fc9e2..da538bc7d 100644 --- a/cmd/restic/cmd_ls.go +++ b/cmd/restic/cmd_ls.go @@ -19,6 +19,7 @@ The "ls" command allows listing files and directories in a snapshot. The special snapshot-ID "latest" can be used to list files and directories of the latest snapshot in the repository. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runLs(lsOptions, globalOptions, args) }, diff --git a/cmd/restic/cmd_manpage.go b/cmd/restic/cmd_manpage.go index 47671c956..31a85109e 100644 --- a/cmd/restic/cmd_manpage.go +++ b/cmd/restic/cmd_manpage.go @@ -16,7 +16,8 @@ The "manpage" command generates a manual page for a single command. It can also be used to write all manual pages to a directory. If the output directory is set and no command is specified, all manpages are written to the directory. `, - RunE: runManpage, + DisableAutoGenTag: true, + RunE: runManpage, } var manpageOpts = struct { @@ -42,7 +43,10 @@ func runManpage(cmd *cobra.Command, args []string) error { return doc.GenManTree(cmdRoot, header, dir) } - if len(args) > 1 { + switch { + case len(args) == 0: + return errors.Fatalf("no command given") + case len(args) > 1: return errors.Fatalf("more than one command given: %v", args) } diff --git a/cmd/restic/cmd_migrate.go b/cmd/restic/cmd_migrate.go index 5a4734ffc..a4032775f 100644 --- a/cmd/restic/cmd_migrate.go +++ b/cmd/restic/cmd_migrate.go @@ -14,6 +14,7 @@ var cmdMigrate = &cobra.Command{ The "migrate" command applies migrations to a repository. When no migration name is explicitly given, a list of migrations that can be applied is printed. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runMigrate(migrateOptions, globalOptions, args) }, diff --git a/cmd/restic/cmd_mount.go b/cmd/restic/cmd_mount.go index 14db117ca..76f2e5915 100644 --- a/cmd/restic/cmd_mount.go +++ b/cmd/restic/cmd_mount.go @@ -27,6 +27,7 @@ var cmdMount = &cobra.Command{ The "mount" command mounts the repository via fuse to a directory. This is a read-only mount. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runMount(mountOptions, globalOptions, args) }, diff --git a/cmd/restic/cmd_options.go b/cmd/restic/cmd_options.go index be19ea76b..d30002a92 100644 --- a/cmd/restic/cmd_options.go +++ b/cmd/restic/cmd_options.go @@ -14,7 +14,8 @@ var optionsCmd = &cobra.Command{ Long: ` The "options" command prints a list of extended options. `, - Hidden: true, + Hidden: true, + DisableAutoGenTag: true, Run: func(cmd *cobra.Command, args []string) { fmt.Printf("All Extended Options:\n") for _, opt := range options.List() { diff --git a/cmd/restic/cmd_prune.go b/cmd/restic/cmd_prune.go index c40bdc7e2..ea60fd451 100644 --- a/cmd/restic/cmd_prune.go +++ b/cmd/restic/cmd_prune.go @@ -20,6 +20,7 @@ var cmdPrune = &cobra.Command{ The "prune" command checks the repository and removes data that is not referenced and therefore not needed any more. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runPrune(globalOptions) }, diff --git a/cmd/restic/cmd_rebuild_index.go b/cmd/restic/cmd_rebuild_index.go index ed335b271..2f194b93a 100644 --- a/cmd/restic/cmd_rebuild_index.go +++ b/cmd/restic/cmd_rebuild_index.go @@ -16,6 +16,7 @@ var cmdRebuildIndex = &cobra.Command{ The "rebuild-index" command creates a new index based on the pack files in the repository. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runRebuildIndex(globalOptions) }, diff --git a/cmd/restic/cmd_restore.go b/cmd/restic/cmd_restore.go index ca0f6d1e6..4348b1bbb 100644 --- a/cmd/restic/cmd_restore.go +++ b/cmd/restic/cmd_restore.go @@ -19,6 +19,7 @@ a directory. The special snapshot "latest" can be used to restore the latest snapshot in the repository. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runRestore(restoreOptions, globalOptions, args) }, diff --git a/cmd/restic/cmd_snapshots.go b/cmd/restic/cmd_snapshots.go index 5921ec13d..6e14a9bec 100644 --- a/cmd/restic/cmd_snapshots.go +++ b/cmd/restic/cmd_snapshots.go @@ -17,6 +17,7 @@ var cmdSnapshots = &cobra.Command{ Long: ` The "snapshots" command lists all snapshots stored in the repository. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runSnapshots(snapshotOptions, globalOptions, args) }, diff --git a/cmd/restic/cmd_tag.go b/cmd/restic/cmd_tag.go index 33c7e5781..d43a283e5 100644 --- a/cmd/restic/cmd_tag.go +++ b/cmd/restic/cmd_tag.go @@ -22,6 +22,7 @@ add tags to/remove tags from the existing set. When no snapshot-ID is given, all snapshots matching the host, tag and path filter criteria are modified. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runTag(tagOptions, globalOptions, args) }, diff --git a/cmd/restic/cmd_unlock.go b/cmd/restic/cmd_unlock.go index 26bb0fd6a..0b306c37c 100644 --- a/cmd/restic/cmd_unlock.go +++ b/cmd/restic/cmd_unlock.go @@ -13,6 +13,7 @@ var unlockCmd = &cobra.Command{ Long: ` The "unlock" command removes stale locks that have been created by other restic processes. `, + DisableAutoGenTag: true, RunE: func(cmd *cobra.Command, args []string) error { return runUnlock(unlockOptions, globalOptions) }, diff --git a/cmd/restic/cmd_version.go b/cmd/restic/cmd_version.go index d13ec068f..85b8c9e9f 100644 --- a/cmd/restic/cmd_version.go +++ b/cmd/restic/cmd_version.go @@ -14,6 +14,7 @@ var versionCmd = &cobra.Command{ The "version" command prints detailed information about the build environment and the version of this software. `, + DisableAutoGenTag: true, Run: func(cmd *cobra.Command, args []string) { fmt.Printf("restic %s\ncompiled with %v on %v/%v\n", version, runtime.Version(), runtime.GOOS, runtime.GOARCH) diff --git a/cmd/restic/main.go b/cmd/restic/main.go index 195f9e2cc..d44099193 100644 --- a/cmd/restic/main.go +++ b/cmd/restic/main.go @@ -25,8 +25,9 @@ var cmdRoot = &cobra.Command{ restic is a backup program which allows saving multiple revisions of files and directories in an encrypted repository stored on different backends. `, - SilenceErrors: true, - SilenceUsage: true, + SilenceErrors: true, + SilenceUsage: true, + DisableAutoGenTag: true, PersistentPreRunE: func(*cobra.Command, []string) error { // parse extended options diff --git a/doc/man/restic-autocomplete.1 b/doc/man/restic-autocomplete.1 index 907483b53..2c598248f 100644 --- a/doc/man/restic-autocomplete.1 +++ b/doc/man/restic-autocomplete.1 @@ -68,8 +68,3 @@ $ sudo restic autocomplete .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-backup.1 b/doc/man/restic-backup.1 index 3d9183fec..853b3835f 100644 --- a/doc/man/restic-backup.1 +++ b/doc/man/restic-backup.1 @@ -94,8 +94,3 @@ given as the arguments. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-cat.1 b/doc/man/restic-cat.1 index 28da939ac..778a8a4ea 100644 --- a/doc/man/restic-cat.1 +++ b/doc/man/restic-cat.1 @@ -53,8 +53,3 @@ The "cat" command is used to print internal objects to stdout. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-check.1 b/doc/man/restic-check.1 index 8a345a7ed..1af6fbfca 100644 --- a/doc/man/restic-check.1 +++ b/doc/man/restic-check.1 @@ -62,8 +62,3 @@ finds. It can also be used to read all data and therefore simulate a restore. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-dump.1 b/doc/man/restic-dump.1 index 38ddea1db..2d6dbfd91 100644 --- a/doc/man/restic-dump.1 +++ b/doc/man/restic-dump.1 @@ -54,8 +54,3 @@ is used for debugging purposes only. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-find.1 b/doc/man/restic-find.1 index 85b031bfe..a3c613352 100644 --- a/doc/man/restic-find.1 +++ b/doc/man/restic-find.1 @@ -86,8 +86,3 @@ repo. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-forget.1 b/doc/man/restic-forget.1 index e82f1e4b4..8007839d9 100644 --- a/doc/man/restic-forget.1 +++ b/doc/man/restic-forget.1 @@ -112,8 +112,3 @@ data after 'forget' was run successfully, see the 'prune' command. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-init.1 b/doc/man/restic-init.1 index 3342189b6..55f85587b 100644 --- a/doc/man/restic-init.1 +++ b/doc/man/restic-init.1 @@ -53,8 +53,3 @@ The "init" command initializes a new repository. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-key.1 b/doc/man/restic-key.1 index cd41be55a..f5ae61efa 100644 --- a/doc/man/restic-key.1 +++ b/doc/man/restic-key.1 @@ -53,8 +53,3 @@ The "key" command manages keys (passwords) for accessing the repository. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-list.1 b/doc/man/restic-list.1 index 92391e10f..9e5ab4bde 100644 --- a/doc/man/restic-list.1 +++ b/doc/man/restic-list.1 @@ -53,8 +53,3 @@ The "list" command allows listing objects in the repository based on type. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-ls.1 b/doc/man/restic-ls.1 index f6b2b70c7..0c79ca074 100644 --- a/doc/man/restic-ls.1 +++ b/doc/man/restic-ls.1 @@ -72,8 +72,3 @@ The special snapshot\-ID "latest" can be used to list files and directories of t .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-manpage.1 b/doc/man/restic-manpage.1 index a1caed00f..94bc84164 100644 --- a/doc/man/restic-manpage.1 +++ b/doc/man/restic-manpage.1 @@ -59,8 +59,3 @@ set and no command is specified, all manpages are written to the directory. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-migrate.1 b/doc/man/restic-migrate.1 index 7bf86d51d..2bc2b0c68 100644 --- a/doc/man/restic-migrate.1 +++ b/doc/man/restic-migrate.1 @@ -58,8 +58,3 @@ name is explicitly given, a list of migrations that can be applied is printed. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-mount.1 b/doc/man/restic-mount.1 index 99b8c9aeb..8ebebd049 100644 --- a/doc/man/restic-mount.1 +++ b/doc/man/restic-mount.1 @@ -78,8 +78,3 @@ read\-only mount. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-prune.1 b/doc/man/restic-prune.1 index efa25e65a..69bd7c870 100644 --- a/doc/man/restic-prune.1 +++ b/doc/man/restic-prune.1 @@ -54,8 +54,3 @@ referenced and therefore not needed any more. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-rebuild-index.1 b/doc/man/restic-rebuild-index.1 index a94dcbdc9..482a2ff04 100644 --- a/doc/man/restic-rebuild-index.1 +++ b/doc/man/restic-rebuild-index.1 @@ -54,8 +54,3 @@ repository. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-restore.1 b/doc/man/restic-restore.1 index 4947c43af..8f4d785be 100644 --- a/doc/man/restic-restore.1 +++ b/doc/man/restic-restore.1 @@ -82,8 +82,3 @@ repository. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-snapshots.1 b/doc/man/restic-snapshots.1 index 93c4fc355..ee78a24d3 100644 --- a/doc/man/restic-snapshots.1 +++ b/doc/man/restic-snapshots.1 @@ -65,8 +65,3 @@ The "snapshots" command lists all snapshots stored in the repository. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-tag.1 b/doc/man/restic-tag.1 index 36af3bd22..7efe1d210 100644 --- a/doc/man/restic-tag.1 +++ b/doc/man/restic-tag.1 @@ -84,8 +84,3 @@ When no snapshot\-ID is given, all snapshots matching the host, tag and path fil .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-unlock.1 b/doc/man/restic-unlock.1 index c11ddc70d..8ccfd14bc 100644 --- a/doc/man/restic-unlock.1 +++ b/doc/man/restic-unlock.1 @@ -57,8 +57,3 @@ The "unlock" command removes stale locks that have been created by other restic .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic-version.1 b/doc/man/restic-version.1 index 816655e75..174343ac6 100644 --- a/doc/man/restic-version.1 +++ b/doc/man/restic-version.1 @@ -54,8 +54,3 @@ and the version of this software. .SH SEE ALSO .PP \fBrestic(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra diff --git a/doc/man/restic.1 b/doc/man/restic.1 index 0d270b2b4..4e564a35c 100644 --- a/doc/man/restic.1 +++ b/doc/man/restic.1 @@ -52,8 +52,3 @@ directories in an encrypted repository stored on different backends. .SH SEE ALSO .PP \fBrestic\-autocomplete(1)\fP, \fBrestic\-backup(1)\fP, \fBrestic\-cat(1)\fP, \fBrestic\-check(1)\fP, \fBrestic\-dump(1)\fP, \fBrestic\-find(1)\fP, \fBrestic\-forget(1)\fP, \fBrestic\-init(1)\fP, \fBrestic\-key(1)\fP, \fBrestic\-list(1)\fP, \fBrestic\-ls(1)\fP, \fBrestic\-manpage(1)\fP, \fBrestic\-migrate(1)\fP, \fBrestic\-mount(1)\fP, \fBrestic\-prune(1)\fP, \fBrestic\-rebuild\-index(1)\fP, \fBrestic\-restore(1)\fP, \fBrestic\-snapshots(1)\fP, \fBrestic\-tag(1)\fP, \fBrestic\-unlock(1)\fP, \fBrestic\-version(1)\fP - - -.SH HISTORY -.PP -5\-Aug\-2017 Auto generated by spf13/cobra