fix auto update

CHANGELOG.md

@@ -0,0 +1,32 @@
+# Changelog
+
+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.0.3] - 2021-04-20
+
+### Fixed
+
+- Auto upgrade script was not working on linux as linux does not support writing to the binary that is being executed
+
+## [1.0.2] - 2021-04-20
+
+### Added
+
+- Add the `cron` tag to backup to backups made with cron.
+
+### Fixed
+
+- Don't unlock lockfile if process is already running.
+
+## [1.0.1] - 2021-04-17
+
+### Added
+
+- Completion command for various shells
+
+## [1.0.0] - 2021-04-17
+
+- Rewrite in go. See https://autorestic.vercel.app/upgrade for migration.

RELEASE.md

@@ -1,9 +1,9 @@
 # Releasing
 
-Releases are handled by the CD server with includes checksums for each binary.
+Releases are automatically built by the github workflow and uploaded to the release.
 
-```bash
+1. Bump `VERSION` in `internal/config.go`.
-git tag 0.x
+2. Update `CHANGELOG.md`
-git push
+3. Commit to master
-git push origin --tags
+4. Create a new release with the `v1.2.3` tag and mark as draft.
-```
+5. The Github action will build the binaries, upload and mark the release as ready when done.

cmd/backup.go

@@ -20,7 +20,7 @@ var backupCmd = &cobra.Command{
 		CheckErr(err)
 		for _, name := range selected {
 			location, _ := internal.GetLocation(name)
-			location.Backup()
+			location.Backup(false)
 		}
 	},
 }

internal/bins/bins.go

@@ -72,14 +72,21 @@ func downloadAndInstallAsset(body GithubRelease, name string) error {
 			// Uncompress
 			bz := bzip2.NewReader(resp.Body)
 
-			// Save binary
+			// Save to tmp
-			file, err := os.Create(path.Join(INSTALL_PATH, name))
+			// 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.
+			tmp, err := ioutil.TempFile(os.TempDir(), "autorestic-")
 			if err != nil {
 				return err
 			}
-			file.Chmod(0755)
+			defer tmp.Close()
-			defer file.Close()
+			tmp.Chmod(0755)
-			io.Copy(file, bz)
+			io.Copy(tmp, bz)
+
+			to := path.Join(INSTALL_PATH, name)
+			os.Remove(to) // Delete if current, ignore error if file does not exits.
+			if err := os.Rename(tmp.Name(), to); err != nil {
+				return nil
+			}
 
 			colors.Success.Printf("Successfully installed '%s' under %s\n", name, INSTALL_PATH)
 			return nil

internal/config.go

@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-const VERSION = "1.0.1"
+const VERSION = "1.0.3"
 
 var CI bool = false
 var VERBOSE bool = false

internal/location.go

@@ -118,7 +118,7 @@ func (l Location) getPath() (string, error) {
 	return "", fmt.Errorf("could not get path for location \"%s\"", l.name)
 }
 
-func (l Location) Backup() error {
+func (l Location) Backup(cron bool) error {
 	colors.PrimaryPrint("  Backing up location \"%s\"  ", l.name)
 	t := l.getType()
 	options := ExecuteOptions{
@@ -147,6 +147,9 @@ func (l Location) Backup() error {
 		flags := l.getOptions("backup")
 		cmd := []string{"backup"}
 		cmd = append(cmd, flags...)
+		if cron {
+			cmd = append(cmd, "--tag", "cron")
+		}
 		cmd = append(cmd, ".")
 		backupOptions := ExecuteOptions{
 			Dir:  options.Dir,
@@ -291,7 +294,7 @@ func (l Location) RunCron() error {
 	now := time.Now()
 	if now.After(next) {
 		lock.SetCron(l.name, now.Unix())
-		l.Backup()
+		l.Backup(true)
 	} else {
 		colors.Body.Printf("Skipping \"%s\", not due yet.\n", l.name)
 	}

internal/lock/lock.go

@@ -1,10 +1,11 @@
 package lock
 
 import (
-	"errors"
+	"os"
 	"path"
 	"sync"
 
+	"github.com/cupcakearmy/autorestic/internal/colors"
 	"github.com/spf13/viper"
 )
 
@@ -33,7 +34,8 @@ func setLock(locked bool) error {
 	if locked {
 		running := lock.GetBool("running")
 		if running {
-			return errors.New("an instance is already running")
+			colors.Error.Println("an instance is already running. exiting")
+			os.Exit(1)
 		}
 	}
 	lock.Set("running", locked)