Skip to content

Commit d922d36

Browse files
Apply suggestions from code review
Docs cleanup Co-authored-by: Felix Fontein <felix@fontein.de> Signed-off-by: Ricardo Matsui <ricmatsui@gmail.com>
1 parent 08476d1 commit d922d36

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,10 +1053,10 @@ written to disk.
10531053
your password:
10541054
10551055
If you want process signals to be sent to the command, for example if you are
1056-
running ``exec-env`` to launch a server and your server handles sigterm, then the
1056+
running ``exec-env`` to launch a server and your server handles SIGTERM, then the
10571057
``--same-process`` flag can be used to instruct ``sops`` to start your command in
10581058
the same process instead of a child process. This uses the ``execve`` system call
1059-
and is supported on unix-like systems.
1059+
and is supported on Unix-like systems.
10601060
10611061
If the command you want to run only operates on files, you can use ``exec-file``
10621062
instead. By default, SOPS will use a FIFO to pass the contents of the

cmd/sops/subcommand/exec/exec.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ func ExecWithEnv(opts ExecOpts) error {
140140
log.Fatal("background is not supported for same-process")
141141
}
142142

143+
// Note that the call does NOT return, unless an error happens.
143144
return ExecSyscall(opts.Command, env)
144145
}
145146

0 commit comments

Comments
 (0)