Merge branch 'master' into feature/add-docker-cli

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Main
 on:
   push:
     tags:
-      - "v*.*.*"
+      - 'v*.*.*'
 
 jobs:
   docker:
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: "^1.20"
+          go-version: '^1.21'
       - name: Build
         run: go run build/build.go
       - name: Release

Dockerfile

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

cmd/root.go

@@ -59,24 +59,7 @@ func initConfig() {
 			os.Exit(1)
 		}
 	} else {
-		configPaths := []string{"."}
+		configPaths := getConfigPaths()
-
-		// Home
-		if home, err := homedir.Dir(); err == nil {
-			configPaths = append(configPaths, home)
-		}
-
-		// XDG_CONFIG_HOME
-		{
-			prefix, found := os.LookupEnv("XDG_CONFIG_HOME")
-			if !found {
-				if home, err := homedir.Dir(); err != nil {
-					prefix = filepath.Join(home, ".config")
-				}
-			}
-			xdgConfig := filepath.Join(prefix, "autorestic")
-			configPaths = append(configPaths, xdgConfig)
-		}
 		for _, cfgPath := range configPaths {
 			viper.AddConfigPath(cfgPath)
 		}
@@ -88,3 +71,22 @@ func initConfig() {
 		viper.AutomaticEnv()
 	}
 }
+
+func getConfigPaths() []string {
+	result := []string{"."}
+	if home, err := homedir.Dir(); err == nil {
+		result = append(result, home)
+	}
+
+	{
+		xdgConfigHome, found := os.LookupEnv("XDG_CONFIG_HOME")
+		if !found {
+			if home, err := homedir.Dir(); err == nil {
+				xdgConfigHome = filepath.Join(home, ".config")
+			}
+		}
+		xdgConfig := filepath.Join(xdgConfigHome, "autorestic")
+		result = append(result, xdgConfig)
+	}
+	return result
+}

cmd/root_test.go

@@ -0,0 +1,36 @@
+package cmd
+
+import (
+	"github.com/mitchellh/go-homedir"
+	"os"
+	"path/filepath"
+	"slices"
+	"testing"
+)
+
+const xdgConfigHome = "XDG_CONFIG_HOME"
+
+func assertContains(t *testing.T, array []string, element string) {
+	if !slices.Contains(array, element) {
+		t.Errorf("Expected %s to be contained in %s", element, array)
+	}
+}
+
+func TestConfigResolving(t *testing.T) {
+	t.Run("~/.config/autorestic is used if XDG_CONFIG_HOME is not set", func(t *testing.T) {
+		// Override env using testing so that env gets restored after test
+		t.Setenv(xdgConfigHome, "")
+		_ = os.Unsetenv("XDG_CONFIG_HOME")
+		configPaths := getConfigPaths()
+		homeDir, _ := homedir.Dir()
+		expectedConfigPath := filepath.Join(homeDir, ".config/autorestic")
+		assertContains(t, configPaths, expectedConfigPath)
+	})
+
+	t.Run("XDG_CONFIG_HOME is respected if set", func(t *testing.T) {
+		t.Setenv(xdgConfigHome, "/foo/bar")
+
+		configPaths := getConfigPaths()
+		assertContains(t, configPaths, filepath.Join("/", "foo", "bar", "autorestic"))
+	})
+}

docs/pages/cli/forget.md

@@ -4,7 +4,7 @@
 autorestic forget [-l, --location] [-a, --all] [--dry-run] [--prune]
 ```
 
-This will prune and remove old data form the backends according to the [keep policy you have specified for the location](/location/forget).
+This will prune and remove old data form the backends according to the [keep policy you have specified for the location](/location/options/forget).
 
 The `--dry-run` flag will do a dry run showing what would have been deleted, but won't touch the actual data.
 

docs/pages/config.md

@@ -2,10 +2,11 @@
 
 ## Path
 
-By default autorestic searches for a `.autorestic.yml` file in the current directory and your home folder.
+By default autorestic searches for a `.autorestic.yml` file in the current directory, your home folder and your XDG config folder (`~/.config/` by default):
 
 - `./.autorestic.yml`
 - `~/.autorestic.yml`
+- `~/.config/autorestic/.autorestic.yml`
 
 You can also specify a custom file with the `-c path/to/some/config.yml`
 

docs/pages/installation.md

@@ -30,4 +30,4 @@ Fedora users can install the [autorestic](https://src.fedoraproject.org/rpms/aut
 
 ### AUR
 
-~~If you are on Arch there is an [AUR Package](https://aur.archlinux.org/packages/autorestic-bin/) (looking for maintainers).~~ - Deprecated
+If you are on Arch there is an [AUR Package](https://aur.archlinux.org/packages/autorestic-bin/)

go.mod

@@ -1,6 +1,6 @@
 module github.com/cupcakearmy/autorestic
 
-go 1.20
+go 1.21
 
 require (
 	github.com/blang/semver/v4 v4.0.0

internal/backend.go

@@ -143,6 +143,7 @@ func (b Backend) Exec(args []string) error {
 		return err
 	}
 	options := ExecuteOptions{Envs: env}
+	args = append(args, combineBackendOptions("exec", b)...)
 	_, out, err := ExecuteResticCommand(options, args...)
 	if err != nil {
 		colors.Error.Println(out)

internal/config.go

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