Merge pull request #1202 from restic/fix-manpages

Fix manpages, update Go version
2017-09-02 10:11:43 +02:00 · 2017-09-02 10:11:43 +02:00 · a3f6bf3e5a
commit a3f6bf3e5a
parent 73d6b15095 3a5805db50
25 changed files with 37 additions and 26 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -3,6 +3,7 @@ sudo: false

 go:
  - 1.8.3
+  - 1.9
  - tip

 os:
@ -17,11 +18,13 @@ matrix:
  exclude:
    - os: osx
      go: tip
-    - os: linux
+    - os: osx
      go: 1.8.3
+    - os: linux
+      go: 1.9
  include:
    - os: linux
-      go: 1.8.3
+      go: 1.9
      sudo: true
      env:
        RESTIC_TEST_FUSE=1
--- a/appveyor.yml
+++ b/appveyor.yml
@ -17,8 +17,8 @@ init:

 install:
  - rmdir c:\go /s /q
-  - appveyor DownloadFile https://storage.googleapis.com/golang/go1.8.3.windows-amd64.msi
-  - msiexec /i go1.8.3.windows-amd64.msi /q
+  - appveyor DownloadFile https://storage.googleapis.com/golang/go1.9.windows-amd64.msi
+  - msiexec /i go1.9.windows-amd64.msi /q
  - go version
  - go env
  - appveyor DownloadFile http://sourceforge.netcologne.de/project/gnuwin32/tar/1.13-1/tar-1.13-1-bin.zip -FileName tar.zip
--- a/cmd/restic/cmd_manpage.go
+++ b/cmd/restic/cmd_manpage.go
@ -2,6 +2,7 @@ package main

 import (
 	"os"
+	"time"

 	"github.com/restic/restic/internal/errors"
 	"github.com/spf13/cobra"
@ -31,10 +32,17 @@ func init() {
 }

 func runManpage(cmd *cobra.Command, args []string) error {
+	// use a fixed date for the man pages so that generating them is deterministic
+	date, err := time.Parse("Jan 2006", "Jan 2017")
+	if err != nil {
+		return err
+	}
+
 	header := &doc.GenManHeader{
 		Title:   "restic backup",
 		Section: "1",
 		Source:  "generated by `restic manpage`",
+		Date:    &date,
 	}

 	dir := manpageOpts.OutputDir
--- a/doc/man/restic-autocomplete.1
+++ b/doc/man/restic-autocomplete.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-backup.1
+++ b/doc/man/restic-backup.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-cat.1
+++ b/doc/man/restic-cat.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-check.1
+++ b/doc/man/restic-check.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-dump.1
+++ b/doc/man/restic-dump.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-find.1
+++ b/doc/man/restic-find.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-forget.1
+++ b/doc/man/restic-forget.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-init.1
+++ b/doc/man/restic-init.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-key.1
+++ b/doc/man/restic-key.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-list.1
+++ b/doc/man/restic-list.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-ls.1
+++ b/doc/man/restic-ls.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-manpage.1
+++ b/doc/man/restic-manpage.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-migrate.1
+++ b/doc/man/restic-migrate.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-mount.1
+++ b/doc/man/restic-mount.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-prune.1
+++ b/doc/man/restic-prune.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-rebuild-index.1
+++ b/doc/man/restic-rebuild-index.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-restore.1
+++ b/doc/man/restic-restore.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-snapshots.1
+++ b/doc/man/restic-snapshots.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-tag.1
+++ b/doc/man/restic-tag.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-unlock.1
+++ b/doc/man/restic-unlock.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic-version.1
+++ b/doc/man/restic-version.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l

--- a/doc/man/restic.1
+++ b/doc/man/restic.1
@ -1,4 +1,4 @@
-.TH "restic backup" "1" "Aug 2017" "generated by `restic manpage`" "" 
+.TH "restic backup" "1" "Jan 2017" "generated by `restic manpage`" "" 
 .nh
 .ad l