Merge 0c7da11f4d into 3b57602fe8

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

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

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/markdown/installation.md

@@ -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

internal/bins/bins.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path"
@@ -37,7 +36,7 @@ func dlJSON(url string) (GithubRelease, error) {
 		return parsed, err
 	}
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return parsed, err
 
@@ -73,9 +72,10 @@ func downloadAndInstallAsset(body GithubRelease, name string) error {
 			// Uncompress
 			bz := bzip2.NewReader(resp.Body)
 
-			// Save to tmp
+			// Save to tmp file in the same directory as the install directory
-			// Linux does not support overwriting the file that is currently being overwritten, but it can be deleted and a new one moved in its place.
+			// Linux does not support overwriting the file that is currently being running
-			tmp, err := ioutil.TempFile(os.TempDir(), "autorestic-")
+			// But it can be delete the old one and a new one moved in its place.
+			tmp, err := os.CreateTemp(INSTALL_PATH, "autorestic-")
 			if err != nil {
 				return err
 			}
@@ -89,24 +89,26 @@ func downloadAndInstallAsset(body GithubRelease, name string) error {
 
 			to := path.Join(INSTALL_PATH, name)
 			defer os.Remove(tmp.Name()) // Cleanup temporary file after thread exits
-			if err := os.Rename(tmp.Name(), to); err != nil {
+
-				colors.Error.Printf("os.Rename() failed (%v), retrying with io.Copy()\n", err.Error())
+			mode := os.FileMode(0755)
-				var src *os.File
+			if originalBin, err := os.Lstat(to); err == nil {
-				var dst *os.File
+				mode = originalBin.Mode()
-				if src, err = os.Open(tmp.Name()); err != nil {
+				err := os.Remove(to)
-					return err
+				if err != nil {
-				}
-				if dst, err = os.Create(to); err != nil {
-					return err
-				}
-				if _, err := io.Copy(dst, src); err != nil {
-					return err
-				}
-				if err := os.Chmod(to, 0755); err != nil {
 					return err
 				}
 			}
 
+			err = os.Rename(tmp.Name(), to)
+			if err != nil {
+				return err
+			}
+
+			err = os.Chmod(to, mode)
+			if err != nil {
+				return err
+			}
+
 			colors.Success.Printf("Successfully installed '%s' under %s\n", name, INSTALL_PATH)
 			return nil
 		}