fish_job_summary.fish (fish-3.5.0.tar.xz) | : | fish_job_summary.fish (fish-3.5.1.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 38 | skipping to change at line 38 | |||
if string match -iqr 'utf.?8' -- $LANG | if string match -iqr 'utf.?8' -- $LANG | |||
set ellipsis \u2026 | set ellipsis \u2026 | |||
end | end | |||
set -l max_cmd_len 32 | set -l max_cmd_len 32 | |||
if test (string length $cmd_line) -gt $max_cmd_len | if test (string length $cmd_line) -gt $max_cmd_len | |||
set -l truncated_len (math $max_cmd_len - (string length $ellipsis)) | set -l truncated_len (math $max_cmd_len - (string length $ellipsis)) | |||
set cmd_line (string trim (string sub -l $truncated_len $cmd_line))$elli psis | set cmd_line (string trim (string sub -l $truncated_len $cmd_line))$elli psis | |||
end | end | |||
if test $is_foreground -eq 0; and test $signal_or_end_name != STOPPED | ||||
# Add a newline *before* our message so we get the message after the com | ||||
mandline. | ||||
echo >&2 | ||||
end | ||||
switch $signal_or_end_name | switch $signal_or_end_name | |||
case STOPPED | case STOPPED | |||
printf ( _ "fish: Job %s, '%s' has stopped\n" ) $job_id $cmd_line | printf ( _ "fish: Job %s, '%s' has stopped\n" ) $job_id $cmd_line | |||
case ENDED | case ENDED | |||
printf ( _ "fish: Job %s, '%s' has ended\n" ) $job_id $cmd_line | printf ( _ "fish: Job %s, '%s' has ended\n" ) $job_id $cmd_line | |||
case 'SIG*' | case 'SIG*' | |||
if test -n "$proc_pid" | if test -n "$proc_pid" | |||
printf ( _ "fish: Process %s, '%s' from job %s, '%s' terminated by signal %s (%s)\n" ) \ | printf ( _ "fish: Process %s, '%s' from job %s, '%s' terminated by signal %s (%s)\n" ) \ | |||
$proc_pid $proc_name $job_id $cmd_line $signal_or_end_name $ signal_desc | $proc_pid $proc_name $job_id $cmd_line $signal_or_end_name $ signal_desc | |||
else | else | |||
printf ( _ "fish: Job %s, '%s' terminated by signal %s (%s)\n" ) \ | printf ( _ "fish: Job %s, '%s' terminated by signal %s (%s)\n" ) \ | |||
$job_id $cmd_line $signal_or_end_name $signal_desc | $job_id $cmd_line $signal_or_end_name $signal_desc | |||
end | end | |||
end >&2 | end >&2 | |||
string repeat \n --count=(math (count (fish_prompt)) - 1) >&2 | ||||
if test $is_foreground -eq 0; and test $signal_or_end_name != STOPPED | if test $is_foreground -eq 0; and test $signal_or_end_name != STOPPED | |||
# We want one newline per line in the prompt after the first. | ||||
# To ensure that, don't let `string repeat` add a newline. See #9044. | ||||
string repeat -N \n --count=(math (count (fish_prompt)) - 1) >&2 | ||||
commandline -f repaint | commandline -f repaint | |||
end | end | |||
end | end | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 9 lines changed or added |