github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-22 23:57:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try once more to fix the Travis build

Browse Source
This commit is contained in:
ridiculousfish 2019-02-02 17:45:21 -08:00
parent 6ba0d4c88a
commit 22d05dc18b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fish.cpp
View File

@ -383,14 +383,13 @@ int main(int argc, char **argv) {
parser_t &parser = parser_t::principal_parser();
const io_chain_t empty_ios;
if (read_init(paths)) {
// Stomp the exit status of any initialization commands (issue #635).
proc_set_last_status(STATUS_CMD_OK);
// Run post-config commands specified as arguments, if any.
if (!opts.postconfig_cmds.empty()) {
res = run_command_list(&opts.postconfig_cmds, empty_ios);
res = run_command_list(&opts.postconfig_cmds, {});
}
if (!opts.batch_cmds.empty()) {
@ -400,11 +399,11 @@ int main(int argc, char **argv) {
fish_xdm_login_hack_hack_hack_hack(&opts.batch_cmds, argc - my_optind,
argv + my_optind);
}
res = run_command_list(&opts.batch_cmds, empty_ios);
res = run_command_list(&opts.batch_cmds, {});
reader_exit(0, 0);
} else if (my_optind == argc) {
// Implicitly interactive mode.
res = reader_read(STDIN_FILENO, empty_ios);
res = reader_read(STDIN_FILENO, {});
} else {
char *file = *(argv + (my_optind++));
int fd = open(file, O_RDONLY);
@ -424,7 +423,7 @@ int main(int argc, char **argv) {
reader_push_current_filename(rel_filename.c_str());
res = reader_read(fd, empty_ios);
res = reader_read(fd, {});
if (res) {
debug(1, _(L"Error while reading file %ls\n"),