mirror of
https://github.com/getsops/sops.git
synced 2026-02-05 12:45:21 +01:00
Merge pull request #1793 from felixfontein/filename-override-abs
If --filename-override is specified, convert it to an absolute path same as regular filenames
This commit is contained in:
@@ -791,6 +791,11 @@ func main() {
|
||||
fileNameOverride := c.String("filename-override")
|
||||
if fileNameOverride == "" {
|
||||
fileNameOverride = fileName
|
||||
} else {
|
||||
fileNameOverride, err = filepath.Abs(fileNameOverride)
|
||||
if err != nil {
|
||||
return toExitError(err)
|
||||
}
|
||||
}
|
||||
|
||||
inputStore, err := inputStore(c, fileNameOverride)
|
||||
@@ -972,6 +977,11 @@ func main() {
|
||||
fileNameOverride := c.String("filename-override")
|
||||
if fileNameOverride == "" {
|
||||
fileNameOverride = fileName
|
||||
} else {
|
||||
fileNameOverride, err = filepath.Abs(fileNameOverride)
|
||||
if err != nil {
|
||||
return toExitError(err)
|
||||
}
|
||||
}
|
||||
|
||||
inputStore, err := inputStore(c, fileNameOverride)
|
||||
@@ -1138,6 +1148,11 @@ func main() {
|
||||
fileNameOverride := c.String("filename-override")
|
||||
if fileNameOverride == "" {
|
||||
fileNameOverride = fileName
|
||||
} else {
|
||||
fileNameOverride, err = filepath.Abs(fileNameOverride)
|
||||
if err != nil {
|
||||
return toExitError(err)
|
||||
}
|
||||
}
|
||||
|
||||
inputStore, err := inputStore(c, fileNameOverride)
|
||||
@@ -1775,6 +1790,11 @@ func main() {
|
||||
fileNameOverride := c.String("filename-override")
|
||||
if fileNameOverride == "" {
|
||||
fileNameOverride = fileName
|
||||
} else {
|
||||
fileNameOverride, err = filepath.Abs(fileNameOverride)
|
||||
if err != nil {
|
||||
return toExitError(err)
|
||||
}
|
||||
}
|
||||
|
||||
commandCount := 0
|
||||
|
||||
Reference in New Issue
Block a user