Skip to content

Commit ba5ab82

Browse files
committed
If --filename-override is specified, convert it to an absolute path same as regular filenames.
Signed-off-by: Felix Fontein <felix@fontein.de>
1 parent 024b94f commit ba5ab82

1 file changed

Lines changed: 20 additions & 0 deletions

File tree

cmd/sops/main.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,11 @@ func main() {
785785
fileNameOverride := c.String("filename-override")
786786
if fileNameOverride == "" {
787787
fileNameOverride = fileName
788+
} else {
789+
fileNameOverride, err = filepath.Abs(fileNameOverride)
790+
if err != nil {
791+
return toExitError(err)
792+
}
788793
}
789794

790795
inputStore, err := inputStore(c, fileNameOverride)
@@ -966,6 +971,11 @@ func main() {
966971
fileNameOverride := c.String("filename-override")
967972
if fileNameOverride == "" {
968973
fileNameOverride = fileName
974+
} else {
975+
fileNameOverride, err = filepath.Abs(fileNameOverride)
976+
if err != nil {
977+
return toExitError(err)
978+
}
969979
}
970980

971981
inputStore, err := inputStore(c, fileNameOverride)
@@ -1132,6 +1142,11 @@ func main() {
11321142
fileNameOverride := c.String("filename-override")
11331143
if fileNameOverride == "" {
11341144
fileNameOverride = fileName
1145+
} else {
1146+
fileNameOverride, err = filepath.Abs(fileNameOverride)
1147+
if err != nil {
1148+
return toExitError(err)
1149+
}
11351150
}
11361151

11371152
inputStore, err := inputStore(c, fileNameOverride)
@@ -1768,6 +1783,11 @@ func main() {
17681783
fileNameOverride := c.String("filename-override")
17691784
if fileNameOverride == "" {
17701785
fileNameOverride = fileName
1786+
} else {
1787+
fileNameOverride, err = filepath.Abs(fileNameOverride)
1788+
if err != nil {
1789+
return toExitError(err)
1790+
}
17711791
}
17721792

17731793
commandCount := 0

0 commit comments

Comments
 (0)