mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-26 12:53:13 +00:00
Merge remote-tracking branch 'upstream/master' into bind_mode
This commit is contained in:
Julian Aron Prenner
commit
1157d330a6
6 changed files with 19 additions and 51 deletions
|
|
@ -47,7 +47,6 @@ mandir = @mandir@
|
|||
sysconfdir = @sysconfdir@
|
||||
docdir = @docdir@
|
||||
localedir = @localedir@
|
||||
optbindirs = @optbindirs@
|
||||
|
||||
#
|
||||
# Various flags
|
||||
|
|
@ -302,7 +301,8 @@ doc/refman.pdf: doc
|
|||
#
|
||||
|
||||
test: $(PROGRAMS) fish_tests
|
||||
./fish_tests; cd tests; ../fish <test.fish;
|
||||
./fish_tests
|
||||
cd tests; ../fish <test.fish;
|
||||
.PHONY: test
|
||||
|
||||
|
||||
|
|
@ -376,8 +376,6 @@ doc.h: $(HDR_FILES)
|
|||
-e "s,@docdir\@,$(docdir),g" \
|
||||
-e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|g" \
|
||||
-e "s,@prefix\@,$(prefix),g" \
|
||||
-e "s,@optbindirs\@,$(optbindirs),g"
|
||||
#-e "s,@\@,$(),"
|
||||
|
||||
|
||||
#
|
||||
|
|
|
|||
38
configure.ac
38
configure.ac
|
|
@ -21,7 +21,6 @@ conf_arg=$@
|
|||
# List of output variables produced by this configure script
|
||||
#
|
||||
|
||||
AC_SUBST(docdir)
|
||||
AC_SUBST(HAVE_GETTEXT)
|
||||
AC_SUBST(HAVE_DOXYGEN)
|
||||
AC_SUBST(LDFLAGS_FISH)
|
||||
|
|
@ -30,9 +29,6 @@ AC_SUBST(LIBS_FISH_INDENT)
|
|||
AC_SUBST(LIBS_FISH_PAGER)
|
||||
AC_SUBST(LIBS_FISHD)
|
||||
AC_SUBST(LIBS_MIMEDB)
|
||||
AC_SUBST(localedir)
|
||||
AC_SUBST(optbindirs)
|
||||
AC_SUBST(prefix)
|
||||
|
||||
|
||||
#
|
||||
|
|
@ -381,40 +377,6 @@ case $target_os in
|
|||
esac
|
||||
|
||||
|
||||
#
|
||||
# Set up PREFIX and related preprocessor symbols. Fish needs to know
|
||||
# where it will be installed. One of the reasons for this is so that
|
||||
# it can make sure the fish installation directory is in the path
|
||||
# during startup.
|
||||
#
|
||||
|
||||
if [[ "$prefix" = NONE ]]; then
|
||||
prefix=/usr/local
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Set up the directory where the documentation files should be
|
||||
# installed
|
||||
#
|
||||
|
||||
AC_ARG_VAR( [docdir], [Documentation directory] )
|
||||
|
||||
if test -z $docdir; then
|
||||
docdir=$datadir/doc/fish
|
||||
else
|
||||
docdir=$docdir
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Set up locale directory. This is where the .po files will be
|
||||
# installed.
|
||||
#
|
||||
|
||||
localedir=$datadir/locale
|
||||
|
||||
|
||||
#
|
||||
# See if Linux procfs is present. This is used to get extra
|
||||
# information about running processes.
|
||||
|
|
|
|||
9
fish.cpp
9
fish.cpp
|
|
@ -188,10 +188,15 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
|
|||
paths.doc = base_path + L"/share/doc/fish";
|
||||
paths.bin = base_path + L"/bin";
|
||||
|
||||
/* Check only that the data and sysconf directories exist. Handle the doc directories separately */
|
||||
struct stat buf;
|
||||
if (0 == wstat(paths.data, &buf) && 0 == wstat(paths.sysconf, &buf) &&
|
||||
0 == wstat(paths.doc, &buf))
|
||||
if (0 == wstat(paths.data, &buf) && 0 == wstat(paths.sysconf, &buf))
|
||||
{
|
||||
/* The docs dir may not exist; in that case fall back to the compiled in path */
|
||||
if (0 != wstat(paths.doc, &buf))
|
||||
{
|
||||
paths.doc = L"" DOCDIR;
|
||||
}
|
||||
done = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2322,14 +2322,14 @@ static void test_new_parser_fuzzing(void)
|
|||
|
||||
double start = timef();
|
||||
bool log_it = true;
|
||||
size_t max_len = 5;
|
||||
for (size_t len = 0; len < max_len; len++)
|
||||
unsigned long max_len = 5;
|
||||
for (unsigned long len = 0; len < max_len; len++)
|
||||
{
|
||||
if (log_it)
|
||||
fprintf(stderr, "%lu / %lu...", len, max_len);
|
||||
|
||||
/* We wish to look at all permutations of 4 elements of 'fuzzes' (with replacement). Construct an int and keep incrementing it. */
|
||||
size_t permutation = 0;
|
||||
unsigned long permutation = 0;
|
||||
while (string_for_permutation(fuzzes, sizeof fuzzes / sizeof *fuzzes, len, permutation++, &src))
|
||||
{
|
||||
parse_tree_from_string(src, parse_flag_continue_after_error, &node_tree, &errors);
|
||||
|
|
@ -2815,4 +2815,7 @@ int main(int argc, char **argv)
|
|||
event_destroy();
|
||||
proc_destroy();
|
||||
|
||||
if(err_count != 0) {
|
||||
return(1);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -360,7 +360,7 @@ rgb_color_t highlight_get_color(highlight_spec_t highlight, bool is_background)
|
|||
size_t idx = highlight_get_primary(highlight);
|
||||
if (idx >= VAR_COUNT)
|
||||
{
|
||||
idx = 0;
|
||||
return rgb_color_t::normal();
|
||||
}
|
||||
|
||||
env_var_t val_wstr = env_get_string(highlight_var[idx]);
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@ if [ "$argv" != '-n' ]
|
|||
|
||||
if test $res = ok;
|
||||
echo File test.fish tested ok
|
||||
exit 0
|
||||
else
|
||||
echo File test.fish failed tests
|
||||
exit 1
|
||||
end;
|
||||
|
||||
exit
|
||||
end
|
||||
|
||||
echo Testing high level script functionality
|
||||
|
|
|
|||
Loading…
Reference in a new issue