DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2025-12-27 22:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fish: Bump to 3.6.0

Browse Source
This commit is contained in:
termux-pacman-bot
2023-01-09 05:31:01 +00:00
parent cd2632468c
commit 0de77aec34
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/fish/src-path.cpp.patch
View File

@@ -20,12 +20,12 @@ index d5a649e0e..ad4e84278 100644
#include "wutil.h" // IWYU pragma: keep
// PREFIX is defined at build time.
-const wcstring_list_t kDefaultPath({L"/bin", L"/usr/bin", PREFIX L"/bin"});
+const wcstring_list_t kDefaultPath({PREFIX L"/bin"});
-static const wcstring_list_t kDefaultPath({L"/bin", L"/usr/bin", PREFIX L"/bin"});
+static const wcstring_list_t kDefaultPath({PREFIX L"/bin"});
static get_path_result_t path_get_path_core(const wcstring &cmd, const wcstring_list_t &pathsv,
const environment_t &vars) {
@@ -53,10 +53,18 @@ static get_path_result_t path_get_path_core(const wcstring &cmd, const wcstring_
static get_path_result_t path_get_path_core(const wcstring &cmd, const wcstring_list_t &pathsv) {
const get_path_result_t noent_res{ENOENT, wcstring{}};
@@ -52,11 +52,19 @@ static get_path_result_t path_get_path_c
return noent_res;
}
@@ -40,12 +40,14 @@ index d5a649e0e..ad4e84278 100644
// If the command has a slash, it must be an absolute or relative path and thus we don't bother
// looking for a matching command.
- if (cmd.find(L'/') != wcstring::npos) {
- wcstring abs_cmd = path_apply_working_directory(cmd, vars.get_pwd_slash());
- int merr = test_path(cmd);
- return get_path_result_t{merr, cmd};
+ if (_cmd.find(L'/') != wcstring::npos) {
+ wcstring abs_cmd = path_apply_working_directory(_cmd, vars.get_pwd_slash());
int merr = test_path(abs_cmd);
return get_path_result_t{merr, std::move(abs_cmd)};
+ int merr = test_path(_cmd);
+ return get_path_result_t{merr, _cmd};
}
get_path_result_t best = noent_res;
@@ -66,7 +74,7 @@ static get_path_result_t path_get_path_core(const wcstring &cmd, const wcstring_
for (const auto &next_path : pathsv) {
if (next_path.empty()) continue;