Merge d332f4476b into bbb1c85cad

README.md

@@ -34,7 +34,7 @@ Autorestic is a wrapper around the amazing [restic](https://restic.net/). While
 - Backup locations to multiple backends
 - Snapshot policies and pruning
 - Fully encrypted
-- Before/after backup hooks
+- Pre/After hooks
 - Exclude pattern/files
 - Cron jobs for automatic backup
 - Backup & Restore docker volume

cmd/unlock.go

@@ -1,81 +0,0 @@
-package cmd
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/cupcakearmy/autorestic/internal"
-	"github.com/cupcakearmy/autorestic/internal/colors"
-	"github.com/cupcakearmy/autorestic/internal/lock"
-	"github.com/spf13/cobra"
-)
-
-var unlockCmd = &cobra.Command{
-	Use:   "unlock",
-	Short: "Unlock autorestic only if you are sure that no other instance is running",
-	Long: `Unlock autorestic only if you are sure that no other instance is running.
-To check you can run "ps aux | grep autorestic".`,
-	Run: func(cmd *cobra.Command, args []string) {
-		internal.GetConfig()
-
-		force, _ := cmd.Flags().GetBool("force")
-
-		if !force && isAutoresticRunning() {
-			colors.Error.Print("Another autorestic instance is running. Are you sure you want to unlock? (yes/no): ")
-			var response string
-			fmt.Scanln(&response)
-			if strings.ToLower(response) != "yes" {
-				colors.Primary.Println("Unlocking aborted.")
-				return
-			}
-		}
-
-		err := lock.Unlock()
-		if err != nil {
-			colors.Error.Println("Could not unlock:", err)
-			return
-		}
-
-		colors.Success.Println("Unlock successful")
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(unlockCmd)
-	unlockCmd.Flags().Bool("force", false, "force unlock")
-}
-
-// isAutoresticRunning checks if autorestic is running
-// and returns true if it is.
-// It also prints the processes to stdout.
-func isAutoresticRunning() bool {
-	cmd := exec.Command("sh", "-c", "ps aux | grep autorestic")
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
-	if err != nil {
-		return false
-	}
-
-	lines := strings.Split(out.String(), "\n")
-	autoresticProcesses := []string{}
-	currentPid := fmt.Sprint(os.Getpid())
-
-	for _, line := range lines {
-		if strings.Contains(line, "autorestic") && !strings.Contains(line, "grep autorestic") && !strings.Contains(line, currentPid) {
-			autoresticProcesses = append(autoresticProcesses, line)
-		}
-	}
-
-	if len(autoresticProcesses) > 0 {
-		colors.Faint.Println("Found autorestic processes:")
-		for _, proc := range autoresticProcesses {
-			colors.Faint.Println(proc)
-		}
-		return true
-	}
-	return false
-}

docs/pages/cli/unlock.md

@@ -1,32 +0,0 @@
-# Unlock
-
-In case autorestic throws the error message `an instance is already running. exiting`, but there is no instance running you can unlock the lock.
-
-To verify that there is no instance running you can use `ps aux | grep autorestic`.
-
-Example with no instance running:
-
-```bash
-> ps aux | grep autorestic
-root       39260  0.0  0.0   6976  2696 pts/11   S+   19:41   0:00 grep autorestic
-```
-
-Example with an instance running:
-
-```bash
-> ps aux | grep autorestic
-root       29465  0.0  0.0 1162068 7380 pts/7    Sl+  19:28   0:00 autorestic --ci backup -a
-root       39260  0.0  0.0   6976  2696 pts/11   S+   19:41   0:00 grep autorestic
-```
-
-**If an instance is running you should not unlock as it could lead to data loss!**
-
-```bash
-autorestic unlock
-```
-
-Use the `--force` to prevent the confirmation prompt if an instance is running.
-
-```bash
-autorestic unlock --force
-```

docs/pages/config.md

@@ -56,8 +56,6 @@ version: 2
 
 extras:
   hooks: &foo
-    prevalidate:
-      - echo "Wake up!"
     before:
       - echo "Hello"
     after:

docs/pages/index.md

@@ -13,7 +13,7 @@ Autorestic is a wrapper around the amazing [restic](https://restic.net/). While
 - Backup locations to multiple backends
 - Snapshot policies and pruning
 - Fully encrypted
-- Before/after backup hooks
+- Pre/After hooks
 - Exclude pattern/files
 - Cron jobs for automatic backup
 - Backup & Restore docker volumes

docs/pages/location/hooks.md

@@ -6,28 +6,23 @@ They consist of a list of commands that will be executed in the same directory a
 
 The following hooks groups are supported, none are required:
 
-- `prevalidate`
 - `before`
 - `after`
 - `failure`
 - `success`
 
-The difference between `prevalidate` and `before` hooks are that `prevalidate` is run before checking the backup location is valid, including checking that the `from` directories exist. This can be useful, for example, to mount the source filesystem that contains the directories listed in `from`.
-
 ```yml | .autorestic.yml
 locations:
   my-location:
     from: /data
     to: my-backend
     hooks:
-      prevalidate:
-        - echo "Checks"
       before:
         - echo "One"
         - echo "Two"
         - echo "Three"
       after:
-        - echo "Bye"
+        - echo "Byte"
       failure:
         - echo "Something went wrong"
       success:
@@ -36,15 +31,13 @@ locations:
 
 ## Flowchart
 
-1. `prevalidate` hook
-2. Check backup location
-3. `before` hook
-4. Run backup
-5. `after` hook
-6. - `success` hook if no errors were found
+1. `before` hook
+2. Run backup
+3. `after` hook
+4. - `success` hook if no errors were found
    - `failure` hook if at least one error was encountered
 
-If either the `prevalidate` or `before` hook encounters errors then the backup and `after` hooks will be skipped and only the `failed` hooks will run.
+If the `before` hook encounters errors the backup and `after` hooks will be skipped and only the `failed` hooks will run.
 
 ## Environment variables
 

internal/config.go

@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-const VERSION = "1.8.1"
+const VERSION = "1.7.11"
 
 type OptionMap map[string][]interface{}
 type Options map[string]OptionMap
@@ -132,11 +132,10 @@ func (c *Config) Describe() {
 
 		tmp = ""
 		hooks := map[string][]string{
-			"PreValidate": l.Hooks.PreValidate,
-			"Before":      l.Hooks.Before,
-			"After":       l.Hooks.After,
-			"Failure":     l.Hooks.Failure,
-			"Success":     l.Hooks.Success,
+			"Before":  l.Hooks.Before,
+			"After":   l.Hooks.After,
+			"Failure": l.Hooks.Failure,
+			"Success": l.Hooks.Success,
 		}
 		for hook, commands := range hooks {
 			if len(commands) > 0 {

internal/location.go

@@ -33,12 +33,11 @@ const (
 )
 
 type Hooks struct {
-	Dir         string    `mapstructure:"dir"`
-	PreValidate HookArray `mapstructure:"prevalidate,omitempty"`
-	Before      HookArray `mapstructure:"before,omitempty"`
-	After       HookArray `mapstructure:"after,omitempty"`
-	Success     HookArray `mapstructure:"success,omitempty"`
-	Failure     HookArray `mapstructure:"failure,omitempty"`
+	Dir     string    `mapstructure:"dir"`
+	Before  HookArray `mapstructure:"before,omitempty"`
+	After   HookArray `mapstructure:"after,omitempty"`
+	Success HookArray `mapstructure:"success,omitempty"`
+	Failure HookArray `mapstructure:"failure,omitempty"`
 }
 
 type LocationCopy = map[string][]string
@@ -185,18 +184,12 @@ func (l Location) Backup(cron bool, specificBackend string) []error {
 		},
 	}
 
-	// Hooks before location validation
-	if err := l.ExecuteHooks(l.Hooks.PreValidate, options); err != nil {
-		errors = append(errors, err)
-		goto after
-	}
-
 	if err := l.validate(); err != nil {
 		errors = append(errors, err)
 		goto after
 	}
 
-	// Hooks after location validation
+	// Hooks
 	if err := l.ExecuteHooks(l.Hooks.Before, options); err != nil {
 		errors = append(errors, err)
 		goto after
@@ -296,13 +289,12 @@ func (l Location) Backup(cron bool, specificBackend string) []error {
 		}
 	}
 
-	// After backup hooks
+	// After hooks
 	if err := l.ExecuteHooks(l.Hooks.After, options); err != nil {
 		errors = append(errors, err)
 	}
 
 after:
-	// Success/failure hooks
 	var commands []string
 	var isSuccess = len(errors) == 0
 	if isSuccess {