mirror of
https://github.com/restic/restic.git
synced 2024-12-24 08:44:52 +00:00
Merge pull request #497 from Thor77/excludeFileExpandEnv
Expand environment-variables in exclude-files
This commit is contained in:
commit
4531456be5
2 changed files with 7 additions and 5 deletions
|
@ -179,7 +179,8 @@ Either specify them with multiple `--exclude`'s or one `--exclude-file`
|
|||
|
||||
Patterns use [`filepath.Glob`](https://golang.org/pkg/path/filepath/#Glob) internally,
|
||||
see [`filepath.Match`](https://golang.org/pkg/path/filepath/#Match) for syntax.
|
||||
Additionally `**` exludes arbitrary subdirectories.
|
||||
Additionally `**` exludes arbitrary subdirectories.
|
||||
Environment-variables in exclude-files are expanded with [`os.ExpandEnv`](https://golang.org/pkg/os/#ExpandEnv).
|
||||
|
||||
# List all snapshots
|
||||
|
||||
|
|
|
@ -6,15 +6,15 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"golang.org/x/crypto/ssh/terminal"
|
||||
"restic"
|
||||
"restic/backend"
|
||||
"restic/debug"
|
||||
"restic/filter"
|
||||
"restic/repository"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"golang.org/x/crypto/ssh/terminal"
|
||||
)
|
||||
|
||||
type CmdBackup struct {
|
||||
|
@ -313,6 +313,7 @@ func (cmd CmdBackup) Execute(args []string) error {
|
|||
for scanner.Scan() {
|
||||
line := scanner.Text()
|
||||
if !strings.HasPrefix(line, "#") {
|
||||
line = os.ExpandEnv(line)
|
||||
cmd.Excludes = append(cmd.Excludes, line)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue