Bump version to 1.7.9 (#325)

Fedora now has an autorestic package and users can install it directly
from Fedora's repositories.

Signed-off-by: Major Hayden <major@mhtx.net>

.github/dependabot.yml

@@ -0,0 +1,8 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Docker Labels
         id: meta
-        uses: crazy-max/ghaction-docker-meta@v2
+        uses: crazy-max/ghaction-docker-meta@v4
         with:
           images: cupcakearmy/autorestic
           tags: |
@@ -23,12 +23,12 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           platforms: linux/amd64,linux/arm64
           push: true
@@ -37,17 +37,12 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
         with:
-          go-version: "^1.16.3"
+          go-version: "^1.20"
       - name: Build
         run: go run build/build.go
-
-      - name: Sign
-        uses: tristan-weil/ghaction-checksum-sign-artifact@v1.0.1
-        with:
-          path: dist/*
       - name: Release
         uses: softprops/action-gh-release@v1
         with:

CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.7.4] - 2023-01-18
+
+### Fixed
+
+- Transformer for extracting information. @11mariom
+
+### Changed
+
+- Bump docker restic version.
+- Docs dependencies updated.
+
 ## [1.7.1] - 2022-04-27
 
 ### Fixed

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine as builder
+FROM golang:1.20-alpine as builder
 
 WORKDIR /app
 COPY go.* .
@@ -6,7 +6,8 @@ RUN go mod download
 COPY . .
 RUN go build
 
-FROM alpine
-RUN apk add --no-cache restic rclone bash openssh
+FROM restic/restic:0.16.0
+RUN apk add --no-cache rclone bash
 COPY --from=builder /app/autorestic /usr/bin/autorestic
+ENTRYPOINT []
 CMD [ "autorestic" ]

build/build.go

@@ -4,7 +4,11 @@
 package main
 
 import (
+	"crypto/md5"
+	"crypto/sha1"
+	"crypto/sha256"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
@@ -31,12 +35,37 @@ type buildOptions struct {
 	Target, Arch, Version string
 }
 
-func build(options buildOptions, wg *sync.WaitGroup) {
-	fmt.Printf("Building %s %s\n", options.Target, options.Arch)
+const (
+	CHECKSUM_MD5     = "MD5SUMS"
+	CHECKSUM_SHA_1   = "SHA1SUMS"
+	CHECKSUM_SHA_256 = "SHA256SUMS"
+)
+
+type Checksums struct {
+	filename, md5, sha1, sha256 string
+}
+
+func writeChecksums(checksums *[]Checksums) {
+	FILE_MD5, _ := os.OpenFile(path.Join(DIR, CHECKSUM_MD5), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
+	defer FILE_MD5.Close()
+	FILE_SHA1, _ := os.OpenFile(path.Join(DIR, CHECKSUM_SHA_1), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
+	defer FILE_SHA1.Close()
+	FILE_SHA256, _ := os.OpenFile(path.Join(DIR, CHECKSUM_SHA_256), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
+	defer FILE_SHA256.Close()
+
+	for _, checksum := range *checksums {
+		fmt.Fprintf(FILE_MD5, "%s %s\n", checksum.md5, checksum.filename)
+		fmt.Fprintf(FILE_SHA1, "%s %s\n", checksum.sha1, checksum.filename)
+		fmt.Fprintf(FILE_SHA256, "%s %s\n", checksum.sha256, checksum.filename)
+	}
+}
+
+func build(options buildOptions, wg *sync.WaitGroup, checksums *[]Checksums) {
+	defer wg.Done()
+
+	fmt.Printf("Building: %s %s\n", options.Target, options.Arch)
 	out := fmt.Sprintf("autorestic_%s_%s_%s", options.Version, options.Target, options.Arch)
 	out = path.Join(DIR, out)
-	out, _ = filepath.Abs(out)
-	fmt.Println(out)
 
 	// Build
 	{
@@ -65,22 +94,39 @@ func build(options buildOptions, wg *sync.WaitGroup) {
 			panic(err)
 		}
 	}
-	wg.Done()
+
+	// Checksum
+	{
+		file := out + ".bz2"
+		content, _ := ioutil.ReadFile(file)
+		*checksums = append(*checksums, Checksums{
+			filename: path.Base(file),
+			md5:      fmt.Sprintf("%x", md5.Sum(content)),
+			sha1:     fmt.Sprintf("%x", sha1.Sum(content)),
+			sha256:   fmt.Sprintf("%x", sha256.Sum256(content)),
+		})
+	}
+
+	fmt.Printf("Built: %s\n", path.Base(out))
 }
 
 func main() {
 	os.RemoveAll(DIR)
 	v := internal.VERSION
+	checksums := []Checksums{}
+
+	// Build async
 	var wg sync.WaitGroup
 	for target, archs := range targets {
 		for _, arch := range archs {
 			wg.Add(1)
-			build(buildOptions{
+			go build(buildOptions{
 				Target:  target,
 				Arch:    arch,
 				Version: v,
-			}, &wg)
+			}, &wg, &checksums)
 		}
 	}
 	wg.Wait()
+	writeChecksums(&checksums)
 }

cmd/root.go

@@ -55,7 +55,7 @@ func initConfig() {
 		viper.SetConfigFile(cfgFile)
 		viper.AutomaticEnv()
 		if viper.ConfigFileUsed() == "" {
-			colors.Error.Println("cannot read config file %s\n", cfgFile)
+			colors.Error.Printf("cannot read config file %s\n", cfgFile)
 			os.Exit(1)
 		}
 	} else {

docs/.codedoc/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@codedoc/core": "^0.2.24"
+    "@codedoc/core": "^0.3.2"
   }
 }

docs/markdown/community.md

@@ -8,5 +8,6 @@ A list of community driven projects. (No official affiliation)
 - Ansible Role: <https://github.com/ItsNotGoodName/ansible-role-autorestic>
 - Ansible Role: <https://github.com/FuzzyMistborn/ansible-role-autorestic>
 - Ansible Role: <https://0xacab.org/varac-projects/ansible-role-autorestic>
+- Ansible Role: <https://github.com/dbrennand/ansible-role-autorestic>
 
 > :ToCPrevNext

docs/markdown/installation.md

@@ -5,7 +5,7 @@ Linux & macOS. Windows is not supported. If you have problems installing please
 Autorestic requires `bash`, `wget` and `bzip2` to be installed. For most systems these should be already installed.
 
 ```bash
-wget -qO - https://raw.githubusercontent.com/CupCakeArmy/autorestic/master/install.sh | bash
+wget -qO - https://raw.githubusercontent.com/cupcakearmy/autorestic/master/install.sh | bash
 ```
 
 ## Alternatives
@@ -24,6 +24,10 @@ You can download the right binary from the release page and simply copy it to `/
 
 If you are on macOS you can install through brew: `brew install autorestic`.
 
+### Fedora
+
+Fedora users can install the [autorestic](https://src.fedoraproject.org/rpms/autorestic/) package with `dnf install autorestic`.
+
 ### AUR
 
 ~~If you are on Arch there is an [AUR Package](https://aur.archlinux.org/packages/autorestic-bin/) (looking for maintainers).~~ - Deprecated

docs/markdown/quick.md

@@ -3,7 +3,7 @@
 ## Installation
 
 ```bash
-wget -qO - https://raw.githubusercontent.com/CupCakeArmy/autorestic/master/install.sh | bash
+wget -qO - https://raw.githubusercontent.com/cupcakearmy/autorestic/master/install.sh | bash
 ```
 
 See [installation](/installation) for alternative options.

docs/package.json

@@ -5,6 +5,6 @@
     "dev": "codedoc serve"
   },
   "dependencies": {
-    "@codedoc/cli": "^0.2.8"
+    "@codedoc/cli": "^0.3.0"
   }
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/cupcakearmy/autorestic
 
-go 1.18
+go 1.20
 
 require (
 	github.com/blang/semver/v4 v4.0.0
@@ -28,8 +28,8 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
-	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/text v0.3.8 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect

go.sum

@@ -324,8 +324,8 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -333,8 +333,8 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

install.sh

@@ -31,6 +31,11 @@ else
 fi
 echo $ARCH
 
+if ! command -v bzip2 &>/dev/null; then
+    echo "Missing bzip2 command. Please install the bzip2 package for your system."
+    exit 1
+fi
+
 wget -qO - https://api.github.com/repos/cupcakearmy/autorestic/releases/latest \
 | grep "browser_download_url.*_${OS}_${ARCH}" \
 | cut -d : -f 2,3 \

internal/backend.go

@@ -38,7 +38,7 @@ func (b Backend) generateRepo() (string, error) {
 	case "local":
 		return GetPathRelativeToConfig(b.Path)
 	case "rest":
-		parsed, err := url.Parse(b.Path)
+		parsed, err := url.Parse(os.ExpandEnv(b.Path))
 		if err != nil {
 			return "", err
 		}

internal/config.go

@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-const VERSION = "1.7.4"
+const VERSION = "1.7.9"
 
 type OptionMap map[string][]interface{}
 type Options map[string]OptionMap

internal/metadata/extractor_added.go

@@ -14,9 +14,9 @@ func (e addedExtractor) Matches(line string) bool {
 }
 func (e addedExtractor) Extract(metadata *BackupLogMetadata, line string) {
 	// Sample line: "Added to the repo: 0 B"
-	metadata.AddedSize = strings.TrimSpace(e.re.ReplaceAllString(line, ""))
+	metadata.AddedSize = strings.TrimSpace(e.re.ReplaceAllString(line, "$2"))
 }
 
 func NewAddedExtractor() MetadatExtractor {
-	return addedExtractor{regexp.MustCompile(`(?i)^Added to the repo:`)}
+	return addedExtractor{regexp.MustCompile(`(?i)^Added to the repo(sitory)?: ([\d\.]+ \w+)( \([\d\.]+[\w\s]+\))?`)}
 }