h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-04 07:21:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong exit code for jobs #2505

Browse Source
This commit is contained in:
Max Nordlund
2015-11-25 14:37:48 +01:00
committed by ridiculousfish
parent d325b4bf39
commit 2d90859cab
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/builtin_jobs.cpp
View File

@@ -254,15 +254,6 @@ static int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv)
}
}
/*
Do not babble if not interactive
*/
if (streams.out_is_redirected)
{
found=1;
}
if (print_last)
{
/*
@@ -275,7 +266,7 @@ static int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv)
if ((j->flags & JOB_CONSTRUCTED) && !job_is_completed(j))
{
builtin_jobs_print(j, mode, !found, streams);
builtin_jobs_print(j, mode, !streams.out_is_redirected, streams);
return 0;
}
}
@@ -287,8 +278,6 @@ static int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv)
{
int i;
found = 1;
for (i=w.woptind; i<argc; i++)
{
int pid;
@@ -307,7 +296,8 @@ static int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv)
if (j && !job_is_completed(j))
{
builtin_jobs_print(j, mode, !found, streams);
builtin_jobs_print(j, mode, false, streams);
found = 1;
}
else
{
@@ -338,9 +328,15 @@ static int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv)
if (!found)
{
streams.out.append_format(
_(L"%ls: There are no jobs\n"),
argv[0]);
/*
Do not babble if not interactive
*/
if (streams.out_is_redirected)
{
streams.out.append_format(
_(L"%ls: There are no jobs\n"),
argv[0]);
}
return 1;
}