mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-26 04:43:10 +00:00
Purge remnants of process expansion, document {fish,last}_pid
This commit is contained in:
parent
f9447dc72f
commit
e03c375ee3
5 changed files with 6 additions and 10 deletions
|
@ -1048,6 +1048,10 @@ The user can change the settings of ``fish`` by changing the values of certain v
|
|||
|
||||
- ``argv``, a list of arguments to the shell or function. ``argv`` is only defined when inside a function call, or if fish was invoked with a list of arguments, like ``fish myscript.fish foo bar``. This variable can be changed by the user.
|
||||
|
||||
- ``fish_pid``, the process ID (PID) of the shell.
|
||||
|
||||
- ``last_pid``, the process ID (PID) of the last background process.
|
||||
|
||||
- ``history``, a list containing the last commands that were entered.
|
||||
|
||||
- ``HOME``, the user's home directory. This variable can be changed by the user.
|
||||
|
|
4
po/sv.po
4
po/sv.po
|
@ -58809,10 +58809,6 @@ msgstr "Hjälp om jokertecken *.*"
|
|||
msgid "Help on command substitution (SUBCOMMAND)"
|
||||
msgstr "Hjälp om kommandosubstitution (UNDERKOMMANDO)"
|
||||
|
||||
#: share/completions/help.fish:32
|
||||
msgid "Help on process expansion %JOB"
|
||||
msgstr "Hjälp om processexpansion %JOB"
|
||||
|
||||
#: share/completions/history.fish:1
|
||||
msgid "Match history items that start with the given prefix"
|
||||
msgstr ""
|
||||
|
|
|
@ -22,7 +22,6 @@ complete -c help -x -a expand-command-substitution -d 'Command substitution'
|
|||
complete -c help -x -a expand-command-substitution -d 'Command substitution (SUBCOMMAND)'
|
||||
complete -c help -x -a expand-home -d 'Home directory expansion ~USER'
|
||||
complete -c help -x -a expand-index-range -d 'Index range expansion'
|
||||
complete -c help -x -a expand-process -d 'Process expansion %JOB'
|
||||
complete -c help -x -a expand-variable -d 'Variable expansion $VARNAME'
|
||||
complete -c help -x -a expand-wildcard -d 'Wildcard expansion *.*'
|
||||
# Note: This is hard-coded in help.fish - it's not an anchor in the html.
|
||||
|
|
|
@ -240,9 +240,6 @@ void parse_error_offset_source_start(parse_error_list_t *errors, size_t amt);
|
|||
/// Error message when encountering a failed expansion, e.g. for the variable name in for loops.
|
||||
#define FAILED_EXPANSION_VARIABLE_NAME_ERR_MSG _(L"Unable to expand variable name '%ls'")
|
||||
|
||||
/// Error message when encountering a failed process expansion, e.g. %notaprocess.
|
||||
#define FAILED_EXPANSION_PROCESS_ERR_MSG _(L"Unable to find a process '%ls'")
|
||||
|
||||
/// Error message when encountering an illegal file descriptor.
|
||||
#define ILLEGAL_FD_ERR_MSG _(L"Illegal file descriptor in redirection '%ls'")
|
||||
|
||||
|
|
|
@ -8,11 +8,11 @@ $fish -c 'begin; exit 5; true; end'
|
|||
echo $status
|
||||
#CHECK: 5
|
||||
|
||||
$fish -c 'kill -SIGHUP %self'
|
||||
$fish -c 'kill -SIGHUP $fish_pid'
|
||||
echo $status
|
||||
#CHECK: 129
|
||||
|
||||
$fish -c 'function main; kill -SIGTERM %self; true; end; main'
|
||||
$fish -c 'function main; kill -SIGTERM $fish_pid; true; end; main'
|
||||
echo $status
|
||||
#CHECK: 143
|
||||
|
||||
|
|
Loading…
Reference in a new issue