Compare commits

..

5 Commits

Author SHA1 Message Date
ea82fea8e1 add cron tag 2021-04-20 20:49:09 +02:00
a35edcaea5 version bump 2021-04-17 20:55:09 +02:00
86d44eafad exit with better message 2021-04-17 20:51:40 +02:00
e927fd5a64 panic on already running 2021-04-17 20:45:52 +02:00
d5e13d4e27 changelog 2021-04-17 17:54:24 +02:00
5 changed files with 37 additions and 6 deletions

26
CHANGELOG.md Normal file
View File

@@ -0,0 +1,26 @@
# 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.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.

View File

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

View File

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

View File

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

View File

@@ -1,10 +1,11 @@
package lock package lock
import ( import (
"errors" "os"
"path" "path"
"sync" "sync"
"github.com/cupcakearmy/autorestic/internal/colors"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
@@ -33,7 +34,8 @@ func setLock(locked bool) error {
if locked { if locked {
running := lock.GetBool("running") running := lock.GetBool("running")
if 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) lock.Set("running", locked)