add more architectures for linux build process

equivalent to 7d665fa1f4/helpers/build-release-binaries/main.go

.github/dependabot.yml

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

CHANGELOG.md

@@ -5,17 +5,6 @@ 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.20-alpine as builder
+FROM golang:1.18-alpine as builder
 
 WORKDIR /app
 COPY go.* .
@@ -6,8 +6,7 @@ RUN go mod download
 COPY . .
 RUN go build
 
-FROM restic/restic:0.15.1
+FROM alpine
-RUN apk add --no-cache rclone bash
+RUN apk add --no-cache restic rclone bash openssh
 COPY --from=builder /app/autorestic /usr/bin/autorestic
-ENTRYPOINT []
 CMD [ "autorestic" ]

build/build.go

@@ -17,14 +17,11 @@ import (
 var DIR, _ = filepath.Abs("./dist")
 
 var targets = map[string][]string{
-	// "aix":     {"ppc64"}, // Not supported by fsnotify
 	"darwin":  {"amd64", "arm64"},
 	"freebsd": {"386", "amd64", "arm"},
-	"linux":   {"386", "amd64", "arm", "arm64", "ppc64le", "mips", "mipsle", "mips64", "mips64le", "s390x"},
+	"linux":   {"386", "amd64", "arm", "arm64", "ppc64le", "mips", "mipsle", "mips64", "mips64le"},
 	"netbsd":  {"386", "amd64"},
 	"openbsd": {"386", "amd64"},
-	// "windows": {"386", "amd64"}, // Not supported by autorestic
-	"solaris": {"amd64"},
 }
 
 type buildOptions struct {

docs/.codedoc/package.json

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

docs/markdown/community.md

@@ -8,6 +8,5 @@ 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

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.3.0"
+    "@codedoc/cli": "^0.2.8"
   }
 }

go.mod

@@ -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-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
-	golang.org/x/text v0.3.8 // indirect
+	golang.org/x/text v0.3.7 // 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-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/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.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 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,11 +31,6 @@ 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(os.ExpandEnv(b.Path))
+		parsed, err := url.Parse(b.Path)
 		if err != nil {
 			return "", err
 		}

internal/config.go

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

internal/location.go

@@ -308,10 +308,7 @@ after:
 
 	// Forget and optionally prune
 	if isSuccess && l.ForgetOption != "" && l.ForgetOption != LocationForgetNo {
-		err := l.Forget(l.ForgetOption == LocationForgetPrune, false)
+		l.Forget(l.ForgetOption == LocationForgetPrune, false)
-		if err != nil {
-			errors = append(errors, err)
-		}
 	}
 
 	if len(errors) == 0 {

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, "$2"))
+	metadata.AddedSize = strings.TrimSpace(e.re.ReplaceAllString(line, ""))
 }
 
 func NewAddedExtractor() MetadatExtractor {
-	return addedExtractor{regexp.MustCompile(`(?i)^Added to the repo(sitory)?: ([\d\.]+ \w+)( \([\d\.]+[\w\s]+\))?`)}
+	return addedExtractor{regexp.MustCompile(`(?i)^Added to the repo:`)}
 }