github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-09 02:38:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve error message for fish scripts without shebang

Browse Source 
When we execute something and it doesn't have a shebang, typically we
fall back on running it with /bin/sh. For .fish scripts, we still
refuse to do this (assuming that /bin/sh won't handle .fish scripts properly).

Only the error wasn't great. So we now explicitly mention when there's
a missing shebang, and point towards the shebang line otherwise.
This commit is contained in:
Fabian Homborg 2021-12-28 15:30:04 +01:00
parent a9f6a38e37
commit 4ceed7c482
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/postfork.cpp
View File

@ -417,10 +417,21 @@ void safe_report_exec_error(int err, const char *actual_cmd, const char *const *
} }
case ENOEXEC: { case ENOEXEC: {
FLOGF_SAFE(exec, char interpreter_buff[128] = {};
"The file '%s' is marked as an executable but could not be run by the " const char *interpreter =
"operating system.", get_interpreter(actual_cmd, interpreter_buff, sizeof interpreter_buff);
actual_cmd); if (!interpreter) {
FLOGF_SAFE(exec,
"The file '%s' is executable but missing a Shebang (#!) line.",
actual_cmd);
} else {
// If the shebang line exists, we would get an ENOENT or similar instead,
// so I don't know how to reach this.
FLOGF_SAFE(exec,
"The file '%s' could not be run by the "
"operating system. Maybe the Shebang (#!) line is broken?",
actual_cmd);
}
break; break;
} }