diff options
author | nia <nia@pkgsrc.org> | 2021-03-05 08:47:29 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2021-03-05 08:47:29 +0000 |
commit | dce5fea0e812505c03ce919169ca2d362f87fc7e (patch) | |
tree | bebdcf2169db5c66c7b7a3a3890a06b78599be3b /shells/fish | |
parent | 75eebd197997e719b912e99f4cf14e70301f3c5b (diff) | |
download | pkgsrc-dce5fea0e812505c03ce919169ca2d362f87fc7e.tar.gz |
fish: Update to 3.2.0
fish 3.2.0 (released March 1, 2021)
===================================
Notable improvements and fixes
------------------------------
- **Undo and redo support** for the command-line editor and pager search (:issue:`1367`). By default, undo is bound to Control+Z, and redo to Alt+/.
- **Builtins can now output before all data is read**. For example, ``string replace`` no longer has to read all of stdin before it can begin to output.
This makes it usable also for pipes where the previous command hasn't finished yet, like::
# Show all dmesg lines related to "usb"
dmesg -w | string match '*usb*'
- **Prompts will now be truncated** instead of replaced with ``"> "`` if they are wider than the terminal (:issue:`904`).
For example::
~/dev/build/fish-shell-git/src/fish-shell/build (makepkg)>
will turn into::
…h-shell/build (makepkg)>
It is still possible to react to the ``COLUMNS`` variable inside the prompt to implement smarter behavior.
- **fish completes ambiguous completions** after pressing :kbd:`Tab` even when they
have a common prefix, without the user having to press :kbd:`Tab` again
(:issue:`6924`).
- fish is less aggressive about resetting terminal modes, such as flow control, after every command.
Although flow control remains off by default, enterprising users can now enable it with
``stty`` (:issue:`2315`, :issue:`7704`).
- A new **"fish_add_path" helper function to add paths to $PATH** without producing duplicates,
to be used interactively or in ``config.fish`` (:issue:`6960`, :issue:`7028`).
For example::
fish_add_path /opt/mycoolthing/bin
will add /opt/mycoolthing/bin to the beginning of $fish_user_path without creating duplicates,
so it can be called safely from config.fish or interactively, and the path will just be there, once.
- **Better errors with "test"** (:issue:`6030`)::
> test 1 = 2 and echo true or false
test: Expected a combining operator like '-a' at index 4
1 = 2 and echo true or echo false
^
This includes numbering the index from 1 instead of 0, like fish lists.
- **A new theme for the documentation and Web-based configuration** (:issue:`6500`, :issue:`7371`, :issue:`7523`), matching the design on fishshell.com.
- ``fish --no-execute`` **will no longer complain about unknown commands**
or non-matching wildcards, as these could be defined differently at
runtime (especially for functions). This makes it usable as a static syntax checker (:issue:`977`).
- ``string match --regex`` now integrates **named PCRE2 capture groups as fish variables**, allowing variables to be set directly from ``string match`` (:issue:`7459`). To support this functionality, ``string`` is now a reserved word and can no longer be wrapped in a function.
- Globs and other **expansions are limited to 512,288 results** (:issue:`7226`). Because operating systems limit the number of arguments to commands, larger values are unlikely to work anyway, and this helps to avoid hangs.
- A new **"fish for bash users" documentation page** gives a quick overview of the scripting differences between bash and fish (:issue:`2382`), and the completion tutorial has also been moved out into its own document (:issue:`6709`).
Syntax changes and new commands
-------------------------------
- Range limits in index range expansions like ``$x[$start..$end]`` may be omitted: ``$start`` and ``$end`` default to 1 and -1 (the last item) respectively (:issue:`6574`)::
echo $var[1..]
echo $var[..-1]
echo $var[..]
All print the full list ``$var``.
- When globbing, a segment which is exactly ``**`` may now match zero directories. For example ``**/foo`` may match ``foo`` in the current directory (:issue:`7222`).
Scripting improvements
----------------------
- The ``type``, ``_`` (gettext), ``.`` (source) and ``:`` (no-op) functions
are now implemented builtins for performance purposes (:issue:`7342`, :issue:`7036`, :issue:`6854`).
- ``set`` and backgrounded jobs no longer overwrite ``$pipestatus`` (:issue:`6820`), improving its use in command substitutions (:issue:`6998`).
- Computed ("electric") variables such as ``status`` are now only global in scope, so ``set -Uq status`` returns false (:issue:`7032`).
- The output for ``set --show`` has been shortened, only mentioning the scopes in which a variable exists (:issue:`6944`).
In addition, it now shows if a variable is a path variable.
- A new variable, ``fish_kill_signal``, is set to the signal that terminated the last foreground job, or ``0`` if the job exited normally (:issue:`6824`, :issue:`6822`).
- A new subcommand, ``string pad``, allows extending strings to a given width (:issue:`7340`, :issue:`7102`).
- ``string sub`` has a new ``--end`` option to specify the end index of
a substring (:issue:`6765`, :issue:`5974`).
- ``string split`` has a new ``--fields`` option to specify fields to
output, similar to ``cut -f`` (:issue:`6770`).
- ``string trim`` now also trims vertical tabs by default (:issue:`6795`).
- ``string replace`` no longer prints an error if a capturing group wasn't matched, instead treating it as empty (:issue:`7343`).
- ``string`` subcommands now quit early when used with ``--quiet`` (:issue:`7495`).
- ``string repeat`` now handles multiple arguments, repeating each one (:issue:`5988`).
- ``printf`` no longer prints an error if not given an argument (not
even a format string).
- The ``true`` and ``false`` builtins ignore any arguments, like other shells (:issue:`7030`).
- ``fish_indent`` now removes unnecessary quotes in simple cases (:issue:`6722`)
and gained a ``--check`` option to just check if a file is indented correctly (:issue:`7251`).
- ``fish_indent`` indents continuation lines that follow a line ending in a backslash, ``|``, ``&&`` or ``||``.
- ``pushd`` only adds a directory to the stack if changing to it was successful (:issue:`6947`).
- A new ``fish_job_summary`` function is called whenever a
background job stops or ends, or any job terminates from a signal (:issue:`6959`, :issue:`2727`, :issue:`4319`).
The default behaviour can now be customized by redefining it.
- ``status`` gained new ``dirname`` and ``basename`` convenience subcommands
to get just the directory to the running script or the name of it,
to simplify common tasks such as running ``(dirname (status filename))`` (:issue:`7076`, :issue:`1818`).
- Broken pipelines are now handled more smoothly; in particular, bad redirection mid-pipeline
results in the job continuing to run but with the broken file descriptor replaced with a closed
file descriptor. This allows better error recovery and is more in line with other shells'
behaviour (:issue:`7038`).
- ``jobs --quiet PID`` no longer prints "no suitable job" if the job for PID does not exist (eg because it has finished) (:issue:`6809`, :issue:`6812`).
- ``jobs`` now shows continued child processes correctly (:issue:`6818`)
- ``disown`` should no longer create zombie processes when job control is off, such as in ``config.fish`` (:issue:`7183`).
- ``command``, ``jobs`` and ``type`` builtins support ``--query`` as the long form of ``-q``, matching other builtins.
The long form ``--quiet`` is deprecated (:issue:`7276`).
- ``argparse`` no longer requires a short flag letter for long-only options (:issue:`7585`)
and only prints a backtrace with invalid options to argparse itself (:issue:`6703`).
- ``argparse`` now passes the validation variables (e.g. ``$_flag_value``) as local-exported variables,
avoiding the need for ``--no-scope-shadowing`` in validation functions.
- ``complete`` takes the first argument as the name of the command if the ``--command``/``-c`` option is not used,
so ``complete git`` is treated like ``complete --command git``,
and it can show the loaded completions for specific commands with ``complete COMMANDNAME`` (:issue:`7321`).
- ``set_color -b`` (without an argument) no longer prints an error message, matching other invalid invocations of this command (:issue:`7154`).
- ``exec`` no longer produces a syntax error when the command cannot be found (:issue:`6098`).
- ``set --erase`` and ``abbr --erase`` can now erase multiple things in one go, matching ``functions --erase`` (:issue:`7377`).
- ``abbr --erase`` no longer prints errors when used with no arguments or on an unset abbreviation (:issue:`7376`, :issue:`7732`).
- ``test -t``, for testing whether file descriptors are connected to a terminal, works for file descriptors 0, 1, and 2 (:issue:`4766`).
It can still return incorrect results in other cases (:issue:`1228`).
- Trying to execute scripts with Windows line endings (CRLF) produces a sensible error (:issue:`2783`).
- Trying to execute commands with arguments that exceed the operating system limit now produces a specific error (:issue:`6800`).
- An ``alias`` that delegates to a command with the same name no longer triggers an error about recursive completion (:issue:`7389`).
- ``math`` now has a ``--base`` option to output the result in hexadecimal or octal (:issue:`7496`) and produces more specific error messages (:issue:`7508`).
- ``math`` learned bitwise functions ``bitand``, ``bitor`` and ``bitxor``, used like ``math "bitand(0xFE, 5)"`` (:issue:`7281`).
- ``math`` learned tau for those who don't like typing "2 * pi".
- Failed redirections will now set ``$status`` (:issue:`7540`).
- fish sets exit status in a more consistent manner after errors, including invalid expansions like ``$foo[``.
- Using ``read --silent`` while fish is in private mode was adding these potentially-sensitive entries to the history; this has been fixed (:issue:`7230`).
- ``read`` can now read interactively from other files, and can be used to read from the terminal via ``read </dev/tty`` (if the operating system provides ``/dev/tty``) (:issue:`7358`).
- A new ``fish_status_to_signal`` function for transforming exit statuses to signal names has been added (:issue:`7597`, :issue:`7595`).
- The fallback ``realpath`` builtin supports the ``-s``/``--no-symlinks`` option, like GNU realpath (:issue:`7574`).
- ``functions`` and ``type`` now explain when a function was defined via ``source`` instead of just saying ``Defined in -``.
- Significant performance improvements when globbing, appending to variables or in ``math``.
- ``echo`` no longer interprets options at the beginning of an argument (eg ``echo "-n foo"``) (:issue:`7614`).
- fish now finds user configuration even if the ``HOME`` environment variable is not set (:issue:`7620`).
- fish no longer crashes when started from a Windows-style working directory (eg ``F:\path``) (:issue:`7636`).
- ``fish -c`` now reads the remaining arguments into ``$argv`` (:issue:`2314`).
- The ``pwd`` command supports the long options ``--logical`` and ``--physical``, matching other implementations (:issue:`6787`).
- ``fish --profile`` now only starts profiling after fish is ready to execute commands (all configuration is completed). There is a new ``--profile-startup`` option that only profiles the startup and configuration process (:issue:`7648`).
- Builtins return a maximum exit status of 255, rather than potentially overflowing. In particular, this affects ``exit``, ``return``, ``functions --query``, and ``set --query`` (:issue:`7698`, :issue:`7702`).
- It is no longer an error to run builtin with closed stdin. For example ``count <&-`` now prints 0, instead of failing.
- Blocks, functions, and builtins no longer permit redirecting to file descriptors other than 0 (standard input), 1 (standard output) and 2 (standard error). For example, ``echo hello >&5`` is now an error. This prevents corruption of internal state (#3303).
Interactive improvements
------------------------
- fish will now always attempt to become process group leader in interactive mode (:issue:`7060`). This helps avoid hangs in certain circumstances, and allows tmux's current directory introspection to work (:issue:`5699`).
- The interactive reader now allows ending a line in a logical operators (``&&`` and ``||``) instead of complaining about a missing command. (This was already syntactically valid, but interactive sessions didn't know about it yet).
- The prompt is reprinted after a background job exits (:issue:`1018`).
- fish no longer inserts a space after a completion ending in ``.``, ``,`` or ``-`` is accepted, improving completions for tools that provide dynamic completions (:issue:`6928`).
- If a filename is invalid when first pressing :kbd:`Tab`, but becomes valid, it will be completed properly on the next attempt (:issue:`6863`).
- ``help string match/replace/<subcommand>`` will show the help for string subcommands (:issue:`6786`).
- ``fish_key_reader`` sets the exit status to 0 when used with ``--help`` or ``--version`` (:issue:`6964`).
- ``fish_key_reader`` and ``fish_indent`` send output from ``--version`` to standard output, matching other fish binaries (:issue:`6964`).
- A new variable ``$status_generation`` is incremented only when the previous command produces an exit status (:issue:`6815`). This can be used, for example, to check whether a failure status is a holdover due to a background job, or actually produced by the last run command.
- ``fish_greeting`` is now a function that reads a variable of the same name, and defaults to setting it globally.
This removes a universal variable by default and helps with updating the greeting.
However, to disable the greeting it is now necessary to explicitly specify universal scope (``set -U fish_greeting``) or to disable it in config.fish (:issue:`7265`).
- Events are properly emitted after a job is cancelled (:issue:`2356`).
- ``fish_preexec`` and ``fish_postexec`` events are no longer triggered for empty commands (:issue:`4829`, :issue:`7085`).
- Functions triggered by the ``fish_exit`` event are correctly run when the terminal is closed or the shell receives SIGHUP (:issue:`7014`).
- The ``fish_prompt`` event no longer fires when ``read`` is used. If
you need a function to run any time ``read`` is invoked by a script,
use the new ``fish_read`` event instead (:issue:`7039`).
- A new ``fish_posterror`` event is emitted when attempting to execute a command with syntax errors (:issue:`6880`, :issue:`6816`).
- The debugging system has now fully switched from the old numbered level to the new named category system introduced in 3.1. A number of new debugging categories have been added, including ``config``, ``path``, ``reader`` and ``screen`` (:issue:`6511`). See the output of ``fish --print-debug-categories`` for the full list.
- The warning about read-only filesystems has been moved to a new "warning-path" debug category
and can be disabled by setting a debug category of ``-warning-path`` (:issue:`6630`)::
fish --debug=-warning-path
- The enabled debug categories are now printed on shell startup (:issue:`7007`).
- The ``-o`` short option to fish, for ``--debug-output``, works correctly instead of producing an
invalid option error (:issue:`7254`).
- fish's debugging can now also be enabled via ``FISH_DEBUG`` and ``FISH_DEBUG_OUTPUT`` environment variables.
This helps with debugging when no commandline options can be passed, like when fish is called in a shebang (:issue:`7359`).
- Abbreviations are now expanded after all command terminators (eg ``;`` or ``|``), not just space,
as in fish 2.7.1 and before (:issue:`6970`), and after closing a command substitution (:issue:`6658`).
- The history file is now created with user-private permissions,
matching other shells (:issue:`6926`). The directory containing the history
file was already private, so there should not have been any private data
revealed.
- The output of ``time`` is now properly aligned in all cases (:issue:`6726`, :issue:`6714`) and no longer depends on locale (:issue:`6757`).
- The command-not-found handling has been simplified.
When it can't find a command, fish now just executes a function called ``fish_command_not_found``
instead of firing an event, making it easier to replace and reason about.
Previously-defined ``__fish_command_not_found_handler`` functions with an appropriate event listener will still work (:issue:`7293`).
- :kbd:`Control-C` handling has been reimplemented in C++ and is therefore quicker (:issue:`5259`), no longer occasionally prints an "unknown command" error (:issue:`7145`) or overwrites multiline prompts (:issue:`3537`).
- :kbd:`Control-C` no longer kills background jobs for which job control is
disabled, matching POSIX semantics (:issue:`6828`, :issue:`6861`).
- Autosuggestions work properly after :kbd:`Control-C` cancels the current commmand line (:issue:`6937`).
- History search is now case-insensitive unless the search string contains an uppercase character (:issue:`7273`).
- ``fish_update_completions`` gained a new ``--keep`` option, which improves speed by skipping completions that already exist (:issue:`6775`, :issue:`6796`).
- Aliases containing an embedded backslash appear properly in the output of ``alias`` (:issue:`6910`).
- ``open`` no longer hangs indefinitely on certain systems, as a bug in ``xdg-open`` has been worked around (:issue:`7215`).
- Long command lines no longer add a blank line after execution (:issue:`6826`) and behave better with :kbd:`Backspace` (:issue:`6951`).
- ``functions -t`` works like the long option ``--handlers-type``, as documented, instead of producing an error (:issue:`6985`).
- History search now flashes when it found no more results (:issue:`7362`)
- fish now creates the path in the environment variable ``XDG_RUNTIME_DIR`` if it does not exist, before using it for runtime data storage (:issue:`7335`).
- ``set_color --print-colors`` now also respects the bold, dim, underline, reverse, italic and background modifiers, to better show their effect (:issue:`7314`).
- The fish Web configuration tool (``fish_config``) shows prompts correctly on Termux for Android (:issue:`7298`) and detects Windows Services for Linux 2 properly (:issue:`7027`). It no longer shows the ``history`` variable as it may be too large (one can use the History tab instead). It also starts the browser in another thread, avoiding hangs in some circumstances, especially with Firefox's Developer Edition (:issue:`7158`). Finally, a bug in the Source Code Pro font may cause browsers to hang, so this font is no longer chosen by default (:issue:`7714`).
- ``funcsave`` gained a new ``--directory`` option to specify the location of the saved function (:issue:`7041`).
- ``help`` works properly on MSYS2 (:issue:`7113`) and only uses ``cmd.exe`` if running on WSL (:issue:`6797`).
- Resuming a piped job by its number, like ``fg %1``, works correctly (:issue:`7406`). Resumed jobs show the correct title in the terminal emulator (:issue:`7444`).
- Commands run from key bindings now use the same TTY modes as normal commands (:issue:`7483`).
- Autosuggestions from history are now case-sensitive (:issue:`3978`).
- ``$status`` from completion scripts is no longer passed outside the completion, which keeps the status display in the prompt as the last command's status (:issue:`7555`).
- Updated localisations for pt_BR (:issue:`7480`).
- ``fish_trace`` output now starts with ``->`` (like ``fish --profile``), making the depth more visible (:issue:`7538`).
- Resizing the terminal window no longer produces a corrupted prompt (:issue:`6532`, :issue:`7404`).
- ``functions`` produces an error rather than crashing on certain invalid arguments (:issue:`7515`).
- A crash in completions with inline variable assignment (eg ``A= b``) has been fixed (:issue:`7344`).
- ``fish_private_mode`` may now be changed dynamically using ``set`` (:issue:`7589`), and history is kept in memory in private mode (but not stored permanently) (:issue:`7590`).
- Commands with leading spaces may be retrieved from history with up-arrow until a new command is run, matching zsh's ``HIST_IGNORE_SPACE`` (:issue:`1383`).
- Importing bash history or reporting errors with recursive globs (``**``) no longer hangs (:issue:`7407`, :issue:`7497`).
- ``bind`` now shows ``\x7f`` for the del key instead of a literal DEL character (:issue:`7631`)
- Paths containing variables or tilde expansion are only suggested when they are still valid (:issue:`7582`).
- Syntax highlighting can now color a command as invalid even if executed quickly (:issue:`5912`).
- Redirection targets are no longer highlighted as error if they contain variables which will likely be defined by the current commandline (:issue:`6654`).
- fish is now more resilient against broken terminal modes (:issue:`7133`, :issue:`4873`).
- fish handles being in control of the TTY without owning its own process group better, avoiding some hangs in special configurations (:issue:`7388`).
- Keywords can now be colored differently by setting the ``fish_color_keyword`` variable (``fish_color_command`` is used as a fallback) (:issue:`7678`).
- Just like ``fish_indent``, the interactive reader will indent continuation lines that follow a line ending in a backslash, ``|``, ``&&`` or ``||`` (:issue:`7694`).
- Commands with a trailing escaped space are saved in history correctly (:issue:`7661`).
- ``fish_prompt`` no longer mangles Unicode characters in the private-use range U+F600-U+F700. (:issue:`7723`).
- The universal variable file, ``fish_variables``, can be made a symbolic link without it being overwritten (:issue:`7466`).
- fish is now more resilient against ``mktemp`` failing (:issue:`7482`).
New or improved bindings
^^^^^^^^^^^^^^^^^^^^^^^^
- As mentioned above, new special input functions ``undo`` (:kbd:`Control+\_` or :kbd:`Control+Z`) and ``redo`` (:kbd:`Alt-/`) can be used to revert changes to the command line or the pager search field (:issue:`6570`).
- :kbd:`Control-Z` is now available for binding (:issue:`7152`).
- Additionally, using the ``cancel`` special input function (bound to :kbd:`Escape` by default) right after fish picked an unambiguous completion will undo that (:issue:`7433`).
- ``fish_clipboard_paste`` (:kbd:`Control+V`) trims indentation from multiline commands, because fish already indents (:issue:`7662`).
- Vi mode bindings now support ``dh``, ``dl``, ``c0``, ``cf``, ``ct``, ``cF``, ``cT``, ``ch``, ``cl``, ``y0``, ``ci``, ``ca``, ``yi``, ``ya``, ``di``, ``da``, ``d;``, ``d,``, ``o``, ``O`` and Control+left/right keys to navigate by word (:issue:`6648`, :issue:`6755`, :issue:`6769`, :issue:`7442`, :issue:`7516`).
- Vi mode bindings support :kbd:`~` (tilde) to toggle the case of the selected character (:issue:`6908`).
- Functions ``up-or-search`` and ``down-or-search`` (:kbd:`Up` and :kbd:`Down`) can cross empty lines, and don't activate search mode if the search fails, which makes them easier to use to move between lines in some situations.
- If history search fails to find a match, the cursor is no longer moved. This is useful when accidentally starting a history search on a multi-line commandline.
- The special input function ``beginning-of-history`` (:kbd:`Page Up`) now moves to the oldest search instead of the youngest - that's ``end-of-history`` (:kbd:`Page Down`).
- A new special input function ``forward-single-char`` moves one character to the right, and if an autosuggestion is available, only take a single character from it (:issue:`7217`, :issue:`4984`).
- Special input functions can now be joined with ``or`` as a modifier (adding to ``and``), though only some commands set an exit status (:issue:`7217`). This includes ``suppress-autosuggestion`` to reflect whether an autosuggestion was suppressed (:issue:`1419`)
- A new function ``__fish_preview_current_file``, bound to :kbd:`Alt+O`, opens the
current file at the cursor in a pager (:issue:`6838`, :issue:`6855`).
- ``edit_command_buffer`` (:kbd:`Alt-E` and :kbd:`Alt-V`) passes the cursor position
to the external editor if the editor is recognized (:issue:`6138`, :issue:`6954`).
- ``__fish_prepend_sudo`` (:kbd:`Alt-S`) now toggles a ``sudo`` prefix (:issue:`7012`) and avoids shifting the cursor (:issue:`6542`).
- ``__fish_prepend_sudo`` (:kbd:`Alt-S`) now uses the previous commandline if the current one is empty,
to simplify rerunning the previous command with ``sudo`` (:issue:`7079`).
- ``__fish_toggle_comment_commandline`` (:kbd:`Alt-#`) now uncomments and presents the last comment
from history if the commandline is empty (:issue:`7137`).
- ``__fish_whatis_current_token`` (:kbd:`Alt-W`) prints descriptions for functions and builtins (:issue:`7191`, :issue:`2083`).
- The definition of "word" and "bigword" for movements was refined, fixing (eg) vi mode's behavior with :kbd:`e` on the second-to-last char, and bigword's behavior with single-character words and non-blank non-graphical characters (:issue:`7353`, :issue:`7354`, :issue:`4025`, :issue:`7328`, :issue:`7325`)
- fish's clipboard bindings now also support Windows Subsystem for Linux via PowerShell and clip.exe (:issue:`7455`, :issue:`7458`) and will properly copy newlines in multi-line commands.
- Using the ``*-jump`` special input functions before typing anything else no longer crashes fish.
- Completing variable overrides (``foo=bar``) could replace the entire thing with just the completion in some circumstances. This has been fixed (:issue:`7398`).
Improved prompts
^^^^^^^^^^^^^^^^
- The default and example prompts print the correct exit status for
commands prefixed with ``not`` (:issue:`6566`).
- git prompts include all untracked files in the repository, not just those in the current
directory (:issue:`6086`).
- The git prompts correctly show stash states (:issue:`6876`, :issue:`7136`) and clean states (:issue:`7471`).
- The Mercurial prompt correctly shows untracked status (:issue:`6906`), and by default only shows the branch for performance reasons.
A new variable ``$fish_prompt_hg_show_informative_status`` can be set to enable more information.
- The ``fish_vcs_prompt`` passes its arguments to the various VCS prompts that it calls (:issue:`7033`).
- The Subversion prompt was broken in a number of ways in 3.1.0 and has been restored (:issue:`6715`, :issue:`7278`).
- A new helper function ``fish_is_root_user`` simplifies checking for superuser privilege (:issue:`7031`, :issue:`7123`).
- New colorschemes - ``ayu Light``, ``ayu Dark`` and ``ayu Mirage`` (:issue:`7596`).
- Bugs related to multiline prompts, including repainting (:issue:`5860`) or navigating directory history (:issue:`3550`) leading to graphical glitches have been fixed.
- The ``nim`` prompt now handles vi mode better (:issue:`6802`)
Improved terminal support
^^^^^^^^^^^^^^^^^^^^^^^^^
- A new variable, ``fish_vi_force_cursor``, can be set to force ``fish_vi_cursor`` to attempt changing the cursor
shape in vi mode, regardless of terminal (:issue:`6968`). The ``fish_vi_cursor`` option ``--force-iterm`` has been deprecated.
- ``diff`` will now colourize output, if supported (:issue:`7308`).
- Autosuggestions appear when the cursor passes the right prompt (:issue:`6948`) or wraps to the next line (:issue:`7213`).
- The cursor shape in Vi mode changes properly in Windows Terminal (:issue:`6999`, :issue:`6478`).
- The spurious warning about terminal size in small terminals has been removed (:issue:`6980`).
- Dynamic titles are now enabled in Alacritty (:issue:`7073`) and emacs' vterm (:issue:`7122`).
- Current working directory updates are enabled in foot (:issue:`7099`) and WezTerm (:issue:`7649`).
- The width computation for certain emoji agrees better with terminals (especially flags). (:issue:`7237`).
- Long command lines are wrapped in all cases, instead of sometimes being put on a new line (:issue:`5118`).
- The pager is properly rendered with long command lines selected (:issue:`2557`).
- Sessions with right prompts can be resized correctly in terminals that handle reflow, like GNOME Terminal (and other VTE-based terminals), upcoming Konsole releases and Alacritty. This detection can be overridden with the new ``fish_handle_reflow`` variable (:issue:`7491`).
- fish now sets terminal modes sooner, which stops output from appearing before the greeting and prompt are ready (:issue:`7489`).
- Better detection of new Konsole versions for true color support and cursor shape changing.
- fish no longer attempts to modify the terminal size via ``TIOCSWINSZ``, improving compatibility with Kitty (:issue:`6994`).
Completions
^^^^^^^^^^^
- Added completions for
- ``7z``, ``7za`` and ``7zr`` (:issue:`7220`)
- ``alias`` (:issue:`7035`)
- ``alternatives`` (:issue:`7616`)
- ``apk`` (:issue:`7108`)
- ``asciidoctor`` (:issue:`7000`)
- ``avifdec`` and ``avifenc`` (:issue:`7674`)
- ``bluetoothctl`` (:issue:`7438`)
- ``cjxl`` and ``djxl`` (:issue:`7673`)
- ``cmark`` (:issue:`7000`)
- ``create_ap`` (:issue:`7096`)
- ``deno`` (:issue:`7138`)
- ``dhclient`` (:issue:`6684`)
- Postgres-related commands ``dropdb``, ``createdb``, ``pg_restore``, ``pg_dump`` and
``pg_dumpall`` (:issue:`6620`)
- ``dotnet`` (:issue:`7558`)
- ``downgrade`` (:issue:`6751`)
- ``gapplication``, ``gdbus``, ``gio`` and ``gresource`` (:issue:`7300`)
- ``gh`` (:issue:`7112`)
- ``gitk``
- ``groups`` (:issue:`6889`)
- ``hashcat`` (:issue:`7746`)
- ``hikari`` (:issue:`7083`)
- ``icdiff`` (:issue:`7503`)
- ``imv`` (:issue:`6675`)
- ``john`` (:issue:`7746`)
- ``julia`` (:issue:`7468`)
- ``k3d`` (:issue:`7202`)
- ``ldapsearch`` (:issue:`7578`)
- ``lightdm`` and ``dm-tool`` (:issue:`7624`)
- ``losetup`` (:issue:`7621`)
- ``micro`` (:issue:`7339`)
- ``mpc`` (:issue:`7169`)
- Metasploit's ``msfconsole``, ``msfdb`` and ``msfvenom`` (:issue:`6930`)
- ``mtr`` (:issue:`7638`)
- ``mysql`` (:issue:`6819`)
- ``ncat``, ``nc.openbsd``, ``nc.traditional`` and ``nmap`` (:issue:`6873`)
- ``openssl`` (:issue:`6845`)
- ``prime-run`` (:issue:`7241`)
- ``ps2pdf{12,13,14,wr}`` (:issue:`6673`)
- ``pyenv`` (:issue:`6551`)
- ``rst2html``, ``rst2html4``, ``rst2html5``, ``rst2latex``,
``rst2man``, ``rst2odt``, ``rst2pseudoxml``, ``rst2s5``,
``rst2xetex``, ``rst2xml`` and ``rstpep2html`` (:issue:`7019`)
- ``spago`` (:issue:`7381`)
- ``sphinx-apidoc``, ``sphinx-autogen``, ``sphinx-build`` and
``sphinx-quickstart`` (:issue:`7000`)
- ``strace`` (:issue:`6656`)
- systemd's ``bootctl``, ``coredumpctl``, ``hostnamectl`` (:issue:`7428`), ``homectl`` (:issue:`7435`), ``networkctl`` (:issue:`7668`) and ``userdbctl`` (:issue:`7667`)
- ``tcpdump`` (:issue:`6690`)
- ``tig``
- ``traceroute`` and ``tracepath`` (:issue:`6803`)
- ``windscribe`` (:issue:`6788`)
- ``wireshark``, ``tshark``, and ``dumpcap``
- ``xbps-*`` (:issue:`7239`)
- ``xxhsum``, ``xxh32sum``, ``xxh64sum`` and ``xxh128sum`` (:issue:`7103`)
- ``yadm`` (:issue:`7100`)
- ``zopfli`` and ``zopflipng`` (:issue:`6872`)
- Lots of improvements to completions, including:
- ``git`` completions can complete the right and left parts of a commit range like ``from..to`` or ``left...right``.
- Completion scripts for custom Git subcommands like ``git-xyz`` are now loaded with Git completions. The completions can now be defined directly on the subcommand (using ``complete git-xyz``), and completion for ``git xyz`` will work. (:issue:`7075`, :issue:`7652`, :issue:`4358`)
- ``make`` completions no longer second-guess make's file detection, fixing target completion in some cases (:issue:`7535`).
- Command completions now correctly print the description even if the command was fully matched (like in ``ls<TAB>``).
- ``set`` completions no longer hide variables starting with ``__``, they are sorted last instead.
- Improvements to the manual page completion generator (:issue:`7086`, :issue:`6879`, :issue:`7187`).
- Significant performance improvements to completion of the available commands (:issue:`7153`), especially on macOS Big Sur where there was a significant regression (:issue:`7365`, :issue:`7511`).
- Suffix completion using ``__fish_complete_suffix`` uses the same fuzzy matching logic as normal file completion, and completes any file but sorts files with matching suffix first (:issue:`7040`, :issue:`7547`). Previously, it only completed files with matching suffix.
For distributors
----------------
- fish has a new interactive test driver based on pexpect, removing the optional dependency on expect (and adding an optional dependency on pexpect) (:issue:`5451`, :issue:`6825`).
- The CHANGELOG was moved to restructured text, allowing it to be included in the documentation (:issue:`7057`).
- fish handles ncurses installed in a non-standard prefix better (:issue:`6600`, :issue:`7219`), and uses variadic tparm on NetBSD curses (:issue:`6626`).
- The Web-based configuration tool no longer uses an obsolete Angular version (:issue:`7147`).
- The fish project has adopted the Contributor Covenant code of conduct (:issue:`7151`).
Deprecations and removed features
---------------------------------
- The ``fish_color_match`` variable is no longer used. (Previously this controlled the color of matching quotes and parens when using ``read``).
- fish 3.2.0 will be the last release in which the redirection to standard error with the ``^`` character is enabled.
The ``stderr-nocaret`` feature flag will be changed to "on" in future releases.
- ``string`` is now a reserved word and cannot be used for function names (see above).
- ``fish_vi_cursor``'s option ``--force-iterm`` has been deprecated (see above).
- ``command``, ``jobs`` and ``type`` long-form option ``--quiet`` is deprecated in favor of ``--query`` (see above).
- The ``fish_command_not_found`` event is no longer emitted, instead there is a function of that name.
By default it will call a previously-defined ``__fish_command_not_found_handler``. To emit the event manually use ``emit fish_command_not_found``.
- The ``fish_prompt`` event no longer fires when ``read`` is used. If
you need a function to run any time ``read`` is invoked by a script,
use the new ``fish_read`` event instead (:issue:`7039`).
- To disable the greeting message permanently it is no longer enough to just run ``set fish_greeting`` interactively as it is
no longer implicitly a universal variable. Use ``set -U fish_greeting`` or disable it in config.fish with ``set -g fish_greeting``.
- The long-deprecated and non-functional ``-m``/``--read-mode`` options to ``read`` were removed in 3.1b1. Using the short form, or a never-implemented ``-B`` option, no longer crashes fish (:issue:`7659`).
- With the addition of new categories for debug options, the old numbered debugging levels have been removed.
For distributors and developers
-------------------------------
- fish source tarballs are now distributed using the XZ compression
method (:issue:`5460`).
- The fish source tarball contains an example FreeDesktop entry and icon.
- The CMake variable ``MAC_CODESIGN_ID`` can now be set to "off" to disable code-signing (:issue:`6952`, :issue:`6792`).
- Building on on macOS earlier than 10.13.6 succeeds, instead of failing on code-signing (:issue:`6791`).
- The pkg-config file now uses variables to ensure paths used are portable across prefixes.
- The default values for the ``extra_completionsdir``, ``extra_functionsdir``
and ``extra_confdir`` options now use the installation prefix rather than ``/usr/local`` (:issue:`6778`).
- A new CMake variable ``FISH_USE_SYSTEM_PCRE2`` controls whether fish
builds with the system-installed PCRE2, or the version it bundles. By
default it prefers the system library if available, unless Mac
codesigning is enabled (:issue:`6952`).
- Running the full interactive test suite now requires Python 3.5+ and the pexpect package (:issue:`6825`); the expect package is no longer required.
- Support for Python 2 in fish's tools (``fish_config`` and the manual page completion generator) is no longer guaranteed. Please use Python 3.5 or later (:issue:`6537`).
- The Web-based configuration tool is compatible with Python 3.10 (:issue:`7600`) and no longer requires Python's distutils package (:issue:`7514`).
- fish 3.2 is the last release to support Red Hat Enterprise Linux & CentOS version 6.
--------------
Diffstat (limited to 'shells/fish')
-rw-r--r-- | shells/fish/Makefile | 23 | ||||
-rw-r--r-- | shells/fish/PLIST | 331 | ||||
-rw-r--r-- | shells/fish/distinfo | 19 | ||||
-rw-r--r-- | shells/fish/patches/patch-CMakeLists.txt | 35 | ||||
-rw-r--r-- | shells/fish/patches/patch-cmake_ConfigureChecks.cmake | 48 | ||||
-rw-r--r-- | shells/fish/patches/patch-cmake_Install.cmake | 20 | ||||
-rw-r--r-- | shells/fish/patches/patch-config__cmake.h.in | 14 | ||||
-rw-r--r-- | shells/fish/patches/patch-src_common.cpp | 16 | ||||
-rw-r--r-- | shells/fish/patches/patch-src_fallback.cpp | 17 | ||||
-rw-r--r-- | shells/fish/patches/patch-src_proc.h | 16 | ||||
-rw-r--r-- | shells/fish/patches/patch-src_wutil.cpp | 15 |
11 files changed, 248 insertions, 306 deletions
diff --git a/shells/fish/Makefile b/shells/fish/Makefile index d89f2711e9c..4c2308de193 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -1,21 +1,22 @@ -# $NetBSD: Makefile,v 1.27 2020/12/04 20:45:40 nia Exp $ +# $NetBSD: Makefile,v 1.28 2021/03/05 08:47:29 nia Exp $ -DISTNAME= fish-3.1.2 -PKGREVISION= 2 +DISTNAME= fish-3.2.0 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GITHUB:=fish-shell/} GITHUB_PROJECT= fish-shell GITHUB_RELEASE= ${PKGVERSION_NOREV} +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.fishshell.com/ COMMENT= User friendly command line shell for UNIX-like operating systems LICENSE= gnu-gpl-v2 -USE_LANGUAGES+= c c++03 +USE_LANGUAGES+= c c++ USE_CMAKE= yes USE_TOOLS+= msgfmt CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${PREFIX}/include +CMAKE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR} PKG_SHELL= bin/fish @@ -36,20 +37,22 @@ LDFLAGS+= -lexecinfo # Upstream intentionally omits open.1 on Darwin, but adds realpath.1 PLIST_VARS+= open realpath .if ${OPSYS} == "Darwin" -PLIST.realpath= yes +PLIST.realpath= yes .else PLIST.open= yes .endif -post-extract: - ${RM} ${WRKSRC}/version +EGDIR= ${PREFIX}/share/examples/fish +CONF_FILES= ${EGDIR}/config.fish ${PKG_SYSCONFDIR}/fish/config.fish +OWN_DIRS+= ${PKG_SYSCONFDIR}/fish/functions +OWN_DIRS+= ${PKG_SYSCONFDIR}/fish/conf.d +OWN_DIRS+= ${PKG_SYSCONFDIR}/fish/completions .include "../../devel/pcre2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/gettext-tools/buildlink3.mk" -.if !empty(PKGSRC_COMPILER:M*gcc*) -. include "../../devel/libatomic/buildlink3.mk" -.endif .include "../../lang/python/application.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../mk/atomic64.mk" .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/shells/fish/PLIST b/shells/fish/PLIST index c2773a6802f..1081efcdb9f 100644 --- a/shells/fish/PLIST +++ b/shells/fish/PLIST @@ -1,145 +1,41 @@ -@comment $NetBSD: PLIST,v 1.9 2020/05/17 14:25:47 nia Exp $ +@comment $NetBSD: PLIST,v 1.10 2021/03/05 08:47:29 nia Exp $ bin/fish bin/fish_indent bin/fish_key_reader -etc/fish/config.fish man/man1/fish.1 man/man1/fish_indent.1 man/man1/fish_key_reader.1 +share/applications/fish.desktop share/doc/fish/.buildinfo -share/doc/fish/CHANGELOG.md -share/doc/fish/_sources/cmds/abbr.rst.txt -share/doc/fish/_sources/cmds/alias.rst.txt -share/doc/fish/_sources/cmds/and.rst.txt -share/doc/fish/_sources/cmds/argparse.rst.txt -share/doc/fish/_sources/cmds/begin.rst.txt -share/doc/fish/_sources/cmds/bg.rst.txt -share/doc/fish/_sources/cmds/bind.rst.txt -share/doc/fish/_sources/cmds/block.rst.txt -share/doc/fish/_sources/cmds/break.rst.txt -share/doc/fish/_sources/cmds/breakpoint.rst.txt -share/doc/fish/_sources/cmds/builtin.rst.txt -share/doc/fish/_sources/cmds/case.rst.txt -share/doc/fish/_sources/cmds/cd.rst.txt -share/doc/fish/_sources/cmds/cdh.rst.txt -share/doc/fish/_sources/cmds/command.rst.txt -share/doc/fish/_sources/cmds/commandline.rst.txt -share/doc/fish/_sources/cmds/complete.rst.txt -share/doc/fish/_sources/cmds/contains.rst.txt -share/doc/fish/_sources/cmds/continue.rst.txt -share/doc/fish/_sources/cmds/count.rst.txt -share/doc/fish/_sources/cmds/dirh.rst.txt -share/doc/fish/_sources/cmds/dirs.rst.txt -share/doc/fish/_sources/cmds/disown.rst.txt -share/doc/fish/_sources/cmds/echo.rst.txt -share/doc/fish/_sources/cmds/else.rst.txt -share/doc/fish/_sources/cmds/emit.rst.txt -share/doc/fish/_sources/cmds/end.rst.txt -share/doc/fish/_sources/cmds/eval.rst.txt -share/doc/fish/_sources/cmds/exec.rst.txt -share/doc/fish/_sources/cmds/exit.rst.txt -share/doc/fish/_sources/cmds/false.rst.txt -share/doc/fish/_sources/cmds/fg.rst.txt -share/doc/fish/_sources/cmds/fish.rst.txt -share/doc/fish/_sources/cmds/fish_breakpoint_prompt.rst.txt -share/doc/fish/_sources/cmds/fish_config.rst.txt -share/doc/fish/_sources/cmds/fish_git_prompt.rst.txt -share/doc/fish/_sources/cmds/fish_hg_prompt.rst.txt -share/doc/fish/_sources/cmds/fish_indent.rst.txt -share/doc/fish/_sources/cmds/fish_key_reader.rst.txt -share/doc/fish/_sources/cmds/fish_mode_prompt.rst.txt -share/doc/fish/_sources/cmds/fish_opt.rst.txt -share/doc/fish/_sources/cmds/fish_prompt.rst.txt -share/doc/fish/_sources/cmds/fish_right_prompt.rst.txt -share/doc/fish/_sources/cmds/fish_svn_prompt.rst.txt -share/doc/fish/_sources/cmds/fish_update_completions.rst.txt -share/doc/fish/_sources/cmds/fish_vcs_prompt.rst.txt -share/doc/fish/_sources/cmds/for.rst.txt -share/doc/fish/_sources/cmds/funced.rst.txt -share/doc/fish/_sources/cmds/funcsave.rst.txt -share/doc/fish/_sources/cmds/function.rst.txt -share/doc/fish/_sources/cmds/functions.rst.txt -share/doc/fish/_sources/cmds/help.rst.txt -share/doc/fish/_sources/cmds/history.rst.txt -share/doc/fish/_sources/cmds/if.rst.txt -share/doc/fish/_sources/cmds/isatty.rst.txt -share/doc/fish/_sources/cmds/jobs.rst.txt -share/doc/fish/_sources/cmds/math.rst.txt -share/doc/fish/_sources/cmds/nextd.rst.txt -share/doc/fish/_sources/cmds/not.rst.txt -share/doc/fish/_sources/cmds/open.rst.txt -share/doc/fish/_sources/cmds/or.rst.txt -share/doc/fish/_sources/cmds/popd.rst.txt -share/doc/fish/_sources/cmds/prevd.rst.txt -share/doc/fish/_sources/cmds/printf.rst.txt -share/doc/fish/_sources/cmds/prompt_pwd.rst.txt -share/doc/fish/_sources/cmds/psub.rst.txt -share/doc/fish/_sources/cmds/pushd.rst.txt -share/doc/fish/_sources/cmds/pwd.rst.txt -share/doc/fish/_sources/cmds/random.rst.txt -share/doc/fish/_sources/cmds/read.rst.txt -share/doc/fish/_sources/cmds/realpath.rst.txt -share/doc/fish/_sources/cmds/return.rst.txt -share/doc/fish/_sources/cmds/set.rst.txt -share/doc/fish/_sources/cmds/set_color.rst.txt -share/doc/fish/_sources/cmds/source.rst.txt -share/doc/fish/_sources/cmds/status.rst.txt -share/doc/fish/_sources/cmds/string-collect.rst.txt -share/doc/fish/_sources/cmds/string-escape.rst.txt -share/doc/fish/_sources/cmds/string-join.rst.txt -share/doc/fish/_sources/cmds/string-join0.rst.txt -share/doc/fish/_sources/cmds/string-length.rst.txt -share/doc/fish/_sources/cmds/string-lower.rst.txt -share/doc/fish/_sources/cmds/string-match.rst.txt -share/doc/fish/_sources/cmds/string-repeat.rst.txt -share/doc/fish/_sources/cmds/string-replace.rst.txt -share/doc/fish/_sources/cmds/string-split.rst.txt -share/doc/fish/_sources/cmds/string-split0.rst.txt -share/doc/fish/_sources/cmds/string-sub.rst.txt -share/doc/fish/_sources/cmds/string-trim.rst.txt -share/doc/fish/_sources/cmds/string-unescape.rst.txt -share/doc/fish/_sources/cmds/string-upper.rst.txt -share/doc/fish/_sources/cmds/string.rst.txt -share/doc/fish/_sources/cmds/suspend.rst.txt -share/doc/fish/_sources/cmds/switch.rst.txt -share/doc/fish/_sources/cmds/test.rst.txt -share/doc/fish/_sources/cmds/time.rst.txt -share/doc/fish/_sources/cmds/trap.rst.txt -share/doc/fish/_sources/cmds/true.rst.txt -share/doc/fish/_sources/cmds/type.rst.txt -share/doc/fish/_sources/cmds/ulimit.rst.txt -share/doc/fish/_sources/cmds/umask.rst.txt -share/doc/fish/_sources/cmds/vared.rst.txt -share/doc/fish/_sources/cmds/wait.rst.txt -share/doc/fish/_sources/cmds/while.rst.txt -share/doc/fish/_sources/commands.rst.txt -share/doc/fish/_sources/design.rst.txt -share/doc/fish/_sources/faq.rst.txt -share/doc/fish/_sources/index.rst.txt -share/doc/fish/_sources/license.rst.txt -share/doc/fish/_sources/tutorial.rst.txt +share/doc/fish/CHANGELOG.rst share/doc/fish/_static/ajax-loader.gif share/doc/fish/_static/basic.css +share/doc/fish/_static/classic.css share/doc/fish/_static/comment-bright.png share/doc/fish/_static/comment-close.png share/doc/fish/_static/comment.png +share/doc/fish/_static/copybutton.js share/doc/fish/_static/custom.css +share/doc/fish/_static/default.css share/doc/fish/_static/doctools.js share/doc/fish/_static/documentation_options.js share/doc/fish/_static/down-pressed.png share/doc/fish/_static/down.png share/doc/fish/_static/file.png +share/doc/fish/_static/fish.png share/doc/fish/_static/jquery.js share/doc/fish/_static/language_data.js share/doc/fish/_static/minus.png -share/doc/fish/_static/nature.css share/doc/fish/_static/plus.png +share/doc/fish/_static/pydoctheme.css share/doc/fish/_static/pygments.css share/doc/fish/_static/searchtools.js +share/doc/fish/_static/sidebar.js share/doc/fish/_static/underscore.js share/doc/fish/_static/up-pressed.png share/doc/fish/_static/up.png share/doc/fish/_static/websupport.js +share/doc/fish/cmds/_.html share/doc/fish/cmds/abbr.html share/doc/fish/cmds/alias.html share/doc/fish/cmds/and.html @@ -173,17 +69,23 @@ share/doc/fish/cmds/exit.html share/doc/fish/cmds/false.html share/doc/fish/cmds/fg.html share/doc/fish/cmds/fish.html +share/doc/fish/cmds/fish_add_path.html share/doc/fish/cmds/fish_breakpoint_prompt.html +share/doc/fish/cmds/fish_command_not_found.html share/doc/fish/cmds/fish_config.html share/doc/fish/cmds/fish_git_prompt.html +share/doc/fish/cmds/fish_greeting.html share/doc/fish/cmds/fish_hg_prompt.html share/doc/fish/cmds/fish_indent.html +share/doc/fish/cmds/fish_is_root_user.html share/doc/fish/cmds/fish_key_reader.html share/doc/fish/cmds/fish_mode_prompt.html share/doc/fish/cmds/fish_opt.html share/doc/fish/cmds/fish_prompt.html share/doc/fish/cmds/fish_right_prompt.html +share/doc/fish/cmds/fish_status_to_signal.html share/doc/fish/cmds/fish_svn_prompt.html +share/doc/fish/cmds/fish_title.html share/doc/fish/cmds/fish_update_completions.html share/doc/fish/cmds/fish_vcs_prompt.html share/doc/fish/cmds/for.html @@ -223,6 +125,7 @@ share/doc/fish/cmds/string-join0.html share/doc/fish/cmds/string-length.html share/doc/fish/cmds/string-lower.html share/doc/fish/cmds/string-match.html +share/doc/fish/cmds/string-pad.html share/doc/fish/cmds/string-repeat.html share/doc/fish/cmds/string-replace.html share/doc/fish/cmds/string-split.html @@ -245,16 +148,24 @@ share/doc/fish/cmds/vared.html share/doc/fish/cmds/wait.html share/doc/fish/cmds/while.html share/doc/fish/commands.html +share/doc/fish/completions.html share/doc/fish/design.html share/doc/fish/faq.html +share/doc/fish/fish_for_bash_users.html share/doc/fish/genindex.html share/doc/fish/index.html share/doc/fish/license.html share/doc/fish/objects.inv +share/doc/fish/relnotes.html share/doc/fish/search.html share/doc/fish/searchindex.js share/doc/fish/tutorial.html +share/examples/fish/config.fish share/fish/__fish_build_paths.fish +share/fish/completions/..fish +share/fish/completions/7z.fish +share/fish/completions/7za.fish +share/fish/completions/7zr.fish share/fish/completions/VBoxHeadless.fish share/fish/completions/VBoxSDL.fish share/fish/completions/a2disconf.fish @@ -272,9 +183,11 @@ share/fish/completions/acpi.fish share/fish/completions/adb.fish share/fish/completions/adduser.fish share/fish/completions/adiff.fish +share/fish/completions/alias.fish share/fish/completions/als.fish share/fish/completions/alsactl.fish share/fish/completions/alsamixer.fish +share/fish/completions/alternatives.fish share/fish/completions/amixer.fish share/fish/completions/and.fish share/fish/completions/animate.fish @@ -284,6 +197,7 @@ share/fish/completions/ansible-vault.fish share/fish/completions/ansible.fish share/fish/completions/ant.fish share/fish/completions/apack.fish +share/fish/completions/apk.fish share/fish/completions/apm.fish share/fish/completions/apropos.fish share/fish/completions/apt-build.fish @@ -315,6 +229,7 @@ share/fish/completions/arc.fish share/fish/completions/arepack.fish share/fish/completions/arp.fish share/fish/completions/as.fish +share/fish/completions/asciidoctor.fish share/fish/completions/asp.fish share/fish/completions/at.fish share/fish/completions/atd.fish @@ -324,6 +239,8 @@ share/fish/completions/atq.fish share/fish/completions/atrm.fish share/fish/completions/aunpack.fish share/fish/completions/aura.fish +share/fish/completions/avifdec.fish +share/fish/completions/avifenc.fish share/fish/completions/awk.fish share/fish/completions/aws.fish share/fish/completions/badblocks.fish @@ -336,6 +253,8 @@ share/fish/completions/bg.fish share/fish/completions/bind.fish share/fish/completions/bison.fish share/fish/completions/block.fish +share/fish/completions/bluetoothctl.fish +share/fish/completions/bootctl.fish share/fish/completions/bosh.fish share/fish/completions/bower.fish share/fish/completions/break.fish @@ -370,9 +289,11 @@ share/fish/completions/chmod.fish share/fish/completions/chown.fish share/fish/completions/chronyc.fish share/fish/completions/chsh.fish +share/fish/completions/cjxl.fish share/fish/completions/clang++.fish share/fish/completions/clang.fish share/fish/completions/climate.fish +share/fish/completions/cmark.fish share/fish/completions/code.fish share/fish/completions/colordiff.fish share/fish/completions/colorsvn.fish @@ -390,9 +311,12 @@ share/fish/completions/conjure.fish share/fish/completions/connmanctl.fish share/fish/completions/continue.fish share/fish/completions/convert.fish +share/fish/completions/coredumpctl.fish share/fish/completions/cowsay.fish share/fish/completions/cowthink.fish share/fish/completions/cp.fish +share/fish/completions/create_ap.fish +share/fish/completions/createdb.fish share/fish/completions/cryptsetup.fish share/fish/completions/csc.fish share/fish/completions/csi.fish @@ -412,7 +336,9 @@ share/fish/completions/date.fish share/fish/completions/dconf.fish share/fish/completions/dd.fish share/fish/completions/defaults.fish +share/fish/completions/deno.fish share/fish/completions/df.fish +share/fish/completions/dhclient.fish share/fish/completions/dhcpcd.fish share/fish/completions/diff.fish share/fish/completions/dig.fish @@ -420,14 +346,20 @@ share/fish/completions/diskutil.fish share/fish/completions/display.fish share/fish/completions/djview.fish share/fish/completions/djview4.fish +share/fish/completions/djxl.fish share/fish/completions/dlocate.fish +share/fish/completions/dm-tool.fish share/fish/completions/dmesg.fish share/fish/completions/dnf.fish share/fish/completions/doas.fish share/fish/completions/docker.fish +share/fish/completions/dotnet.fish +share/fish/completions/downgrade.fish share/fish/completions/dpkg-reconfigure.fish share/fish/completions/dpkg.fish +share/fish/completions/dropdb.fish share/fish/completions/du.fish +share/fish/completions/dumpcap.fish share/fish/completions/duply.fish share/fish/completions/dvipdf.fish share/fish/completions/dvipdfm.fish @@ -467,7 +399,9 @@ share/fish/completions/figlet.fish share/fish/completions/file.fish share/fish/completions/find.fish share/fish/completions/fish.fish +share/fish/completions/fish_add_path.fish share/fish/completions/fish_indent.fish +share/fish/completions/fish_key_reader.fish share/fish/completions/flac.fish share/fish/completions/flatpak.fish share/fish/completions/fluxbox-remote.fish @@ -484,10 +418,15 @@ share/fish/completions/fuser.fish share/fish/completions/fusermount.fish share/fish/completions/fzf.fish share/fish/completions/g++.fish +share/fish/completions/gapplication.fish share/fish/completions/gcc.fish share/fish/completions/gdb.fish +share/fish/completions/gdbus.fish share/fish/completions/gem.fish +share/fish/completions/gh.fish +share/fish/completions/gio.fish share/fish/completions/git.fish +share/fish/completions/gitk.fish share/fish/completions/go.fish share/fish/completions/godoc.fish share/fish/completions/gofmt.fish @@ -502,7 +441,9 @@ share/fish/completions/gphoto2.fish share/fish/completions/gprof.fish share/fish/completions/gradle.fish share/fish/completions/grep.fish +share/fish/completions/gresource.fish share/fish/completions/groupadd.fish +share/fish/completions/groups.fish share/fish/completions/grub-file.fish share/fish/completions/grub-install.fish share/fish/completions/grub-mkrescue.fish @@ -513,19 +454,24 @@ share/fish/completions/gv.fish share/fish/completions/gvim.fish share/fish/completions/gvimdiff.fish share/fish/completions/gzip.fish +share/fish/completions/hashcat.fish share/fish/completions/head.fish share/fish/completions/helm.fish share/fish/completions/help.fish share/fish/completions/heroku.fish share/fish/completions/hg.fish share/fish/completions/highlight.fish +share/fish/completions/hikari.fish share/fish/completions/history.fish share/fish/completions/hjson.fish share/fish/completions/hledger.fish +share/fish/completions/homectl.fish +share/fish/completions/hostnamectl.fish share/fish/completions/htop.fish share/fish/completions/hugo.fish share/fish/completions/hwinfo.fish share/fish/completions/i3-msg.fish +share/fish/completions/icdiff.fish share/fish/completions/iconv.fish share/fish/completions/id.fish share/fish/completions/identify.fish @@ -536,6 +482,7 @@ share/fish/completions/ifdata.fish share/fish/completions/ifdown.fish share/fish/completions/ifup.fish share/fish/completions/import.fish +share/fish/completions/imv.fish share/fish/completions/invoke-rc.d.fish share/fish/completions/ip.fish share/fish/completions/ipset.fish @@ -547,8 +494,11 @@ share/fish/completions/jbake.fish share/fish/completions/jest.fish share/fish/completions/jhipster.fish share/fish/completions/jobs.fish +share/fish/completions/john.fish share/fish/completions/journalctl.fish share/fish/completions/jq.fish +share/fish/completions/julia.fish +share/fish/completions/k3d.fish share/fish/completions/kak.fish share/fish/completions/kcmshell5.fish share/fish/completions/kdeconnect-cli.fish @@ -564,15 +514,18 @@ share/fish/completions/la.fish share/fish/completions/latex.fish share/fish/completions/latexmk.fish share/fish/completions/launchctl.fish +share/fish/completions/ldapsearch.fish share/fish/completions/lein.fish share/fish/completions/less.fish share/fish/completions/light.fish +share/fish/completions/lightdm.fish share/fish/completions/ll.fish share/fish/completions/ln.fish share/fish/completions/localectl.fish share/fish/completions/locate.fish share/fish/completions/loginctl.fish share/fish/completions/logkeys.fish +share/fish/completions/losetup.fish share/fish/completions/lp.fish share/fish/completions/lpadmin.fish share/fish/completions/lpinfo.fish @@ -616,6 +569,7 @@ share/fish/completions/mdimport.fish share/fish/completions/mdls.fish share/fish/completions/mdutil.fish share/fish/completions/meson.fish +share/fish/completions/micro.fish share/fish/completions/minikube.fish share/fish/completions/mix.fish share/fish/completions/mkdir.fish @@ -634,16 +588,28 @@ share/fish/completions/mogrify.fish share/fish/completions/montage.fish share/fish/completions/mosh.fish share/fish/completions/mount.fish +share/fish/completions/mpc.fish share/fish/completions/mplayer.fish +share/fish/completions/mpv.fish +share/fish/completions/msfconsole.fish +share/fish/completions/msfdb.fish +share/fish/completions/msfvenom.fish share/fish/completions/msgfmt.fish +share/fish/completions/mtr.fish share/fish/completions/mupdf.fish share/fish/completions/mutt.fish share/fish/completions/mv.fish share/fish/completions/mvn.fish +share/fish/completions/mysql.fish +share/fish/completions/mysqldump.fish share/fish/completions/namei.fish share/fish/completions/native2ascii.fish share/fish/completions/nc.fish +share/fish/completions/nc.openbsd.fish +share/fish/completions/nc.traditional.fish +share/fish/completions/ncat.fish share/fish/completions/ncdu.fish +share/fish/completions/netcat.fish share/fish/completions/netctl-auto.fish share/fish/completions/netctl.fish share/fish/completions/nethack.fish @@ -654,6 +620,7 @@ share/fish/completions/nice.fish share/fish/completions/ninja.fish share/fish/completions/nl.fish share/fish/completions/nm.fish +share/fish/completions/nmap.fish share/fish/completions/nmcli.fish share/fish/completions/node.fish share/fish/completions/not.fish @@ -667,6 +634,7 @@ share/fish/completions/omega.fish share/fish/completions/opam.fish share/fish/completions/open.fish share/fish/completions/openocd.fish +share/fish/completions/openssl.fish share/fish/completions/opkg.fish share/fish/completions/optipng.fish share/fish/completions/or.fish @@ -692,8 +660,12 @@ share/fish/completions/pdftotext.fish share/fish/completions/perl.fish share/fish/completions/pfctl.fish share/fish/completions/pftp.fish +share/fish/completions/pg_dump.fish +share/fish/completions/pg_dumpall.fish +share/fish/completions/pg_restore.fish share/fish/completions/pgrep.fish share/fish/completions/phpunit.fish +share/fish/completions/pidof.fish share/fish/completions/pine.fish share/fish/completions/ping.fish share/fish/completions/pinky.fish @@ -721,15 +693,21 @@ share/fish/completions/ports.fish share/fish/completions/poweroff.fish share/fish/completions/powerpill.fish share/fish/completions/prevd.fish +share/fish/completions/prime-run.fish share/fish/completions/prt-get.fish share/fish/completions/ps.fish share/fish/completions/ps2pdf.fish +share/fish/completions/ps2pdf12.fish +share/fish/completions/ps2pdf13.fish +share/fish/completions/ps2pdf14.fish +share/fish/completions/ps2pdfwr.fish share/fish/completions/psql.fish share/fish/completions/pstack.fish share/fish/completions/psub.fish share/fish/completions/pushd.fish share/fish/completions/pv.fish share/fish/completions/pydf.fish +share/fish/completions/pyenv.fish share/fish/completions/pygmentize.fish share/fish/completions/python.fish share/fish/completions/python2.fish @@ -758,6 +736,17 @@ share/fish/completions/rmdir.fish share/fish/completions/rmmod.fish share/fish/completions/root.fish share/fish/completions/rpm.fish +share/fish/completions/rst2html.fish +share/fish/completions/rst2html4.fish +share/fish/completions/rst2html5.fish +share/fish/completions/rst2latex.fish +share/fish/completions/rst2man.fish +share/fish/completions/rst2odt.fish +share/fish/completions/rst2pseudoxml.fish +share/fish/completions/rst2s5.fish +share/fish/completions/rst2xetex.fish +share/fish/completions/rst2xml.fish +share/fish/completions/rstpep2html.fish share/fish/completions/rsync.fish share/fish/completions/ruby-build.fish share/fish/completions/ruby.fish @@ -783,6 +772,7 @@ share/fish/completions/setfacl.fish share/fish/completions/setsid.fish share/fish/completions/setxkbmap.fish share/fish/completions/sfdx.fish +share/fish/completions/sftp.fish share/fish/completions/sha1sum.fish share/fish/completions/sha224sum.fish share/fish/completions/sha256sum.fish @@ -791,14 +781,21 @@ share/fish/completions/sha512sum.fish share/fish/completions/signify.fish share/fish/completions/snap.fish share/fish/completions/sort.fish +share/fish/completions/source.fish +share/fish/completions/spago.fish share/fish/completions/speedtest-cli.fish share/fish/completions/speedtest.fish +share/fish/completions/sphinx-apidoc.fish +share/fish/completions/sphinx-autogen.fish +share/fish/completions/sphinx-build.fish +share/fish/completions/sphinx-quickstart.fish share/fish/completions/src.fish share/fish/completions/ssh.fish share/fish/completions/sshfs.fish share/fish/completions/stack.fish share/fish/completions/stat.fish share/fish/completions/status.fish +share/fish/completions/strace.fish share/fish/completions/stream.fish share/fish/completions/string.fish share/fish/completions/su.fish @@ -806,6 +803,7 @@ share/fish/completions/subl.fish share/fish/completions/sudo.fish share/fish/completions/svn.fish share/fish/completions/sylpheed.fish +share/fish/completions/synclient.fish share/fish/completions/sysbench.fish share/fish/completions/sysctl.fish share/fish/completions/systemctl.fish @@ -813,12 +811,14 @@ share/fish/completions/systemd-analyze.fish share/fish/completions/systemd-nspawn.fish share/fish/completions/tail.fish share/fish/completions/tar.fish +share/fish/completions/tcpdump.fish share/fish/completions/tee.fish share/fish/completions/telnet.fish share/fish/completions/termite.fish share/fish/completions/terraform.fish share/fish/completions/test.fish share/fish/completions/tex.fish +share/fish/completions/tig.fish share/fish/completions/time.fish share/fish/completions/timedatectl.fish share/fish/completions/timeout.fish @@ -830,13 +830,17 @@ share/fish/completions/top.fish share/fish/completions/totem.fish share/fish/completions/touch.fish share/fish/completions/tr.fish +share/fish/completions/tracepath.fish +share/fish/completions/traceroute.fish share/fish/completions/transmission-remote.fish share/fish/completions/trap.fish share/fish/completions/travis.fish share/fish/completions/tree.fish share/fish/completions/tsc.fish +share/fish/completions/tshark.fish share/fish/completions/ttx.fish share/fish/completions/type.fish +share/fish/completions/udevadm.fish share/fish/completions/udisksctl.fish share/fish/completions/ulimit.fish share/fish/completions/umask.fish @@ -851,6 +855,7 @@ share/fish/completions/unzstd.fish share/fish/completions/update-eix-remote.fish share/fish/completions/update-eix.fish share/fish/completions/useradd.fish +share/fish/completions/userdbctl.fish share/fish/completions/usermod.fish share/fish/completions/vagrant.fish share/fish/completions/valgrind.fish @@ -860,9 +865,11 @@ share/fish/completions/vi.fish share/fish/completions/vim-addons.fish share/fish/completions/vim.fish share/fish/completions/vimdiff.fish +share/fish/completions/vips.fish share/fish/completions/virsh.fish share/fish/completions/vmctl.fish share/fish/completions/w.fish +share/fish/completions/wait.fish share/fish/completions/wajig.fish share/fish/completions/watch.fish share/fish/completions/wc.fish @@ -875,9 +882,26 @@ share/fish/completions/who.fish share/fish/completions/wicd-cli.fish share/fish/completions/wicd-client.fish share/fish/completions/wicd-gtk.fish +share/fish/completions/windscribe.fish +share/fish/completions/wireshark.fish share/fish/completions/wpa_cli.fish share/fish/completions/wvdial.fish share/fish/completions/xargs.fish +share/fish/completions/xbps-alternatives.fish +share/fish/completions/xbps-checkvers.fish +share/fish/completions/xbps-create.fish +share/fish/completions/xbps-dgraph.fish +share/fish/completions/xbps-digest.fish +share/fish/completions/xbps-fbulk.fish +share/fish/completions/xbps-fetch.fish +share/fish/completions/xbps-install.fish +share/fish/completions/xbps-pkgdb.fish +share/fish/completions/xbps-query.fish +share/fish/completions/xbps-reconfigure.fish +share/fish/completions/xbps-remove.fish +share/fish/completions/xbps-rindex.fish +share/fish/completions/xbps-uchroot.fish +share/fish/completions/xbps-uhelper.fish share/fish/completions/xclip.fish share/fish/completions/xdg-mime.fish share/fish/completions/xdvi.fish @@ -892,7 +916,12 @@ share/fish/completions/xrdb.fish share/fish/completions/xsel.fish share/fish/completions/xsv.fish share/fish/completions/xterm.fish +share/fish/completions/xxh128sum.fish +share/fish/completions/xxh32sum.fish +share/fish/completions/xxh64sum.fish +share/fish/completions/xxhsum.fish share/fish/completions/xz.fish +share/fish/completions/yadm.fish share/fish/completions/yaourt.fish share/fish/completions/yarn.fish share/fish/completions/yast2.fish @@ -900,6 +929,8 @@ share/fish/completions/yum.fish share/fish/completions/zcat.fish share/fish/completions/zfs.fish share/fish/completions/zip.fish +share/fish/completions/zopfli.fish +share/fish/completions/zopflipng.fish share/fish/completions/zpaq.fish share/fish/completions/zpool.fish share/fish/completions/zstd.fish @@ -910,26 +941,27 @@ share/fish/completions/zstdmt.fish share/fish/completions/zypper.fish share/fish/config.fish share/fish/functions/N_.fish -share/fish/functions/_.fish share/fish/functions/__fish_abbr_old.fish share/fish/functions/__fish_any_arg_in.fish share/fish/functions/__fish_anypython.fish share/fish/functions/__fish_append.fish +share/fish/functions/__fish_apropos.fish share/fish/functions/__fish_cancel_commandline.fish -share/fish/functions/__fish_clang_complete.fish share/fish/functions/__fish_commandline_is_singlequoted.fish share/fish/functions/__fish_complete_atool_archive_contents.fish share/fish/functions/__fish_complete_bittorrent.fish share/fish/functions/__fish_complete_blockdevice.fish share/fish/functions/__fish_complete_cd.fish +share/fish/functions/__fish_complete_clang.fish share/fish/functions/__fish_complete_command.fish share/fish/functions/__fish_complete_convert_options.fish share/fish/functions/__fish_complete_directories.fish -share/fish/functions/__fish_complete_external_command.fish +share/fish/functions/__fish_complete_docutils.fish share/fish/functions/__fish_complete_ftp.fish share/fish/functions/__fish_complete_gpg.fish share/fish/functions/__fish_complete_gpg_key_id.fish share/fish/functions/__fish_complete_gpg_user_id.fish +share/fish/functions/__fish_complete_group_ids.fish share/fish/functions/__fish_complete_groups.fish share/fish/functions/__fish_complete_job_pids.fish share/fish/functions/__fish_complete_list.fish @@ -937,7 +969,11 @@ share/fish/functions/__fish_complete_lpr.fish share/fish/functions/__fish_complete_lpr_option.fish share/fish/functions/__fish_complete_man.fish share/fish/functions/__fish_complete_mount_opts.fish +share/fish/functions/__fish_complete_mysql.fish +share/fish/functions/__fish_complete_netcat.fish share/fish/functions/__fish_complete_path.fish +share/fish/functions/__fish_complete_pg_database.fish +share/fish/functions/__fish_complete_pg_user.fish share/fish/functions/__fish_complete_pgrep.fish share/fish/functions/__fish_complete_pids.fish share/fish/functions/__fish_complete_ppp_peer.fish @@ -946,7 +982,9 @@ share/fish/functions/__fish_complete_ssh.fish share/fish/functions/__fish_complete_subcommand.fish share/fish/functions/__fish_complete_suffix.fish share/fish/functions/__fish_complete_user_at_hosts.fish +share/fish/functions/__fish_complete_user_ids.fish share/fish/functions/__fish_complete_users.fish +share/fish/functions/__fish_complete_wireshark.fish share/fish/functions/__fish_complete_zfs_mountpoint_properties.fish share/fish/functions/__fish_complete_zfs_pools.fish share/fish/functions/__fish_complete_zfs_ro_properties.fish @@ -966,26 +1004,28 @@ share/fish/functions/__fish_hg_prompt.fish share/fish/functions/__fish_is_first_arg.fish share/fish/functions/__fish_is_first_token.fish share/fish/functions/__fish_is_git_repository.fish +share/fish/functions/__fish_is_nth_token.fish share/fish/functions/__fish_is_switch.fish share/fish/functions/__fish_is_token_n.fish share/fish/functions/__fish_is_zfs_feature_enabled.fish share/fish/functions/__fish_list_current_token.fish +share/fish/functions/__fish_make_cache_dir.fish share/fish/functions/__fish_make_completion_signals.fish share/fish/functions/__fish_man_page.fish +share/fish/functions/__fish_md5.fish share/fish/functions/__fish_move_last.fish share/fish/functions/__fish_no_arguments.fish share/fish/functions/__fish_not_contain_opt.fish +share/fish/functions/__fish_npm_helper.fish share/fish/functions/__fish_number_of_cmd_args_wo_opts.fish share/fish/functions/__fish_paginate.fish share/fish/functions/__fish_parent_directories.fish -share/fish/functions/__fish_pipestatus_with_signal.fish -share/fish/functions/__fish_portage_print_available_pkgs.fish -share/fish/functions/__fish_portage_print_installed_pkgs.fish -share/fish/functions/__fish_portage_print_repository_paths.fish share/fish/functions/__fish_prepend_sudo.fish share/fish/functions/__fish_prev_arg_in.fish +share/fish/functions/__fish_preview_current_file.fish share/fish/functions/__fish_print_VBox_vms.fish share/fish/functions/__fish_print_addresses.fish +share/fish/functions/__fish_print_apt_packages.fish share/fish/functions/__fish_print_cmd_args.fish share/fish/functions/__fish_print_cmd_args_without_options.fish share/fish/functions/__fish_print_commands.fish @@ -993,6 +1033,7 @@ share/fish/functions/__fish_print_debian_apache_confs.fish share/fish/functions/__fish_print_debian_apache_mods.fish share/fish/functions/__fish_print_debian_apache_sites.fish share/fish/functions/__fish_print_encodings.fish +share/fish/functions/__fish_print_eopkg_packages.fish share/fish/functions/__fish_print_filesystems.fish share/fish/functions/__fish_print_gpg_algo.fish share/fish/functions/__fish_print_groups.fish @@ -1003,34 +1044,46 @@ share/fish/functions/__fish_print_lpr_options.fish share/fish/functions/__fish_print_lpr_printers.fish share/fish/functions/__fish_print_modules.fish share/fish/functions/__fish_print_mounted.fish +share/fish/functions/__fish_print_opkg_packages.fish share/fish/functions/__fish_print_packages.fish +share/fish/functions/__fish_print_pacman_packages.fish share/fish/functions/__fish_print_pacman_repos.fish share/fish/functions/__fish_print_pipestatus.fish +share/fish/functions/__fish_print_pkg_add_packages.fish +share/fish/functions/__fish_print_pkg_packages.fish +share/fish/functions/__fish_print_port_packages.fish +share/fish/functions/__fish_print_portage_available_pkgs.fish +share/fish/functions/__fish_print_portage_installed_pkgs.fish +share/fish/functions/__fish_print_portage_packages.fish +share/fish/functions/__fish_print_portage_repository_paths.fish +share/fish/functions/__fish_print_rpm_packages.fish share/fish/functions/__fish_print_service_names.fish share/fish/functions/__fish_print_svn_rev.fish share/fish/functions/__fish_print_users.fish +share/fish/functions/__fish_print_xbps_packages.fish share/fish/functions/__fish_print_xdg_applications_directories.fish share/fish/functions/__fish_print_xdg_mimetypes.fish share/fish/functions/__fish_print_xwindows.fish share/fish/functions/__fish_print_zfs_snapshots.fish +share/fish/functions/__fish_ps.fish share/fish/functions/__fish_pwd.fish share/fish/functions/__fish_seen_argument.fish share/fish/functions/__fish_seen_subcommand_from.fish share/fish/functions/__fish_set_locale.fish share/fish/functions/__fish_shared_key_bindings.fish share/fish/functions/__fish_should_complete_switches.fish -share/fish/functions/__fish_status_to_signal.fish share/fish/functions/__fish_svn_prompt.fish +share/fish/functions/__fish_systemctl.fish share/fish/functions/__fish_systemctl_services.fish share/fish/functions/__fish_systemd_machine_images.fish share/fish/functions/__fish_systemd_machines.fish share/fish/functions/__fish_toggle_comment_commandline.fish +share/fish/functions/__fish_tokenizer_state.fish share/fish/functions/__fish_use_subcommand.fish share/fish/functions/__fish_vcs_prompt.fish share/fish/functions/__fish_whatis.fish share/fish/functions/__fish_whatis_current_token.fish share/fish/functions/__terlar_git_prompt.fish -share/fish/functions/_fish_systemctl.fish share/fish/functions/_validate_int.fish share/fish/functions/abbr.fish share/fish/functions/alias.fish @@ -1038,29 +1091,34 @@ share/fish/functions/cd.fish share/fish/functions/cdh.fish share/fish/functions/contains_seq.fish share/fish/functions/delete-or-exit.fish +share/fish/functions/diff.fish share/fish/functions/dirh.fish share/fish/functions/dirs.fish share/fish/functions/down-or-search.fish share/fish/functions/edit_command_buffer.fish share/fish/functions/export.fish +share/fish/functions/fish_add_path.fish share/fish/functions/fish_breakpoint_prompt.fish share/fish/functions/fish_clipboard_copy.fish share/fish/functions/fish_clipboard_paste.fish +share/fish/functions/fish_command_not_found.fish share/fish/functions/fish_config.fish share/fish/functions/fish_default_key_bindings.fish share/fish/functions/fish_default_mode_prompt.fish share/fish/functions/fish_git_prompt.fish +share/fish/functions/fish_greeting.fish share/fish/functions/fish_hg_prompt.fish share/fish/functions/fish_hybrid_key_bindings.fish share/fish/functions/fish_indent.fish +share/fish/functions/fish_is_root_user.fish +share/fish/functions/fish_job_summary.fish share/fish/functions/fish_key_reader.fish -share/fish/functions/fish_md5.fish share/fish/functions/fish_mode_prompt.fish -share/fish/functions/fish_npm_helper.fish share/fish/functions/fish_opt.fish share/fish/functions/fish_print_git_action.fish share/fish/functions/fish_print_hg_root.fish share/fish/functions/fish_prompt.fish +share/fish/functions/fish_status_to_signal.fish share/fish/functions/fish_svn_prompt.fish share/fish/functions/fish_title.fish share/fish/functions/fish_update_completions.fish @@ -1072,7 +1130,6 @@ share/fish/functions/funcsave.fish share/fish/functions/grep.fish share/fish/functions/help.fish share/fish/functions/history.fish -share/fish/functions/hostname.fish share/fish/functions/isatty.fish share/fish/functions/la.fish share/fish/functions/ll.fish @@ -1093,12 +1150,12 @@ share/fish/functions/seq.fish share/fish/functions/setenv.fish share/fish/functions/suspend.fish share/fish/functions/trap.fish -share/fish/functions/type.fish share/fish/functions/umask.fish share/fish/functions/up-or-search.fish share/fish/functions/vared.fish share/fish/groff/fish.tmac share/fish/lynx.lss +share/fish/man/man1/_.1 share/fish/man/man1/abbr.1 share/fish/man/man1/alias.1 share/fish/man/man1/and.1 @@ -1131,21 +1188,30 @@ share/fish/man/man1/exec.1 share/fish/man/man1/exit.1 share/fish/man/man1/false.1 share/fish/man/man1/fg.1 +share/fish/man/man1/fish-completions.1 share/fish/man/man1/fish-doc.1 share/fish/man/man1/fish-faq.1 +share/fish/man/man1/fish-for-bash-users.1 +share/fish/man/man1/fish-releasenotes.1 share/fish/man/man1/fish-tutorial.1 share/fish/man/man1/fish.1 +share/fish/man/man1/fish_add_path.1 share/fish/man/man1/fish_breakpoint_prompt.1 +share/fish/man/man1/fish_command_not_found.1 share/fish/man/man1/fish_config.1 share/fish/man/man1/fish_git_prompt.1 +share/fish/man/man1/fish_greeting.1 share/fish/man/man1/fish_hg_prompt.1 share/fish/man/man1/fish_indent.1 +share/fish/man/man1/fish_is_root_user.1 share/fish/man/man1/fish_key_reader.1 share/fish/man/man1/fish_mode_prompt.1 share/fish/man/man1/fish_opt.1 share/fish/man/man1/fish_prompt.1 share/fish/man/man1/fish_right_prompt.1 +share/fish/man/man1/fish_status_to_signal.1 share/fish/man/man1/fish_svn_prompt.1 +share/fish/man/man1/fish_title.1 share/fish/man/man1/fish_update_completions.1 share/fish/man/man1/fish_vcs_prompt.1 share/fish/man/man1/for.1 @@ -1161,8 +1227,8 @@ share/fish/man/man1/jobs.1 share/fish/man/man1/math.1 share/fish/man/man1/nextd.1 share/fish/man/man1/not.1 -share/fish/man/man1/or.1 ${PLIST.open}share/fish/man/man1/open.1 +share/fish/man/man1/or.1 share/fish/man/man1/popd.1 share/fish/man/man1/prevd.1 share/fish/man/man1/printf.1 @@ -1185,6 +1251,7 @@ share/fish/man/man1/string-join0.1 share/fish/man/man1/string-length.1 share/fish/man/man1/string-lower.1 share/fish/man/man1/string-match.1 +share/fish/man/man1/string-pad.1 share/fish/man/man1/string-repeat.1 share/fish/man/man1/string-replace.1 share/fish/man/man1/string-split.1 @@ -1212,6 +1279,7 @@ share/fish/tools/web_config/delete.png share/fish/tools/web_config/favicon.png share/fish/tools/web_config/fishconfig.css share/fish/tools/web_config/index.html +share/fish/tools/web_config/js/angular-route.js share/fish/tools/web_config/js/angular-sanitize.js share/fish/tools/web_config/js/angular.js share/fish/tools/web_config/js/app.js @@ -1251,10 +1319,11 @@ share/locale/pl/LC_MESSAGES/fish.mo share/locale/pt_BR/LC_MESSAGES/fish.mo share/locale/sv/LC_MESSAGES/fish.mo share/locale/zh_CN/LC_MESSAGES/fish.mo +share/pixmaps/fish.png share/pkgconfig/fish.pc @pkgdir share/fish/vendor_functions.d @pkgdir share/fish/vendor_conf.d @pkgdir share/fish/vendor_completions.d -@pkgdir etc/fish/functions -@pkgdir etc/fish/conf.d -@pkgdir etc/fish/completions +@pkgdir share/examples/fish/functions +@pkgdir share/examples/fish/conf.d +@pkgdir share/examples/fish/completions diff --git a/shells/fish/distinfo b/shells/fish/distinfo index bf673c5b96d..46354bc3669 100644 --- a/shells/fish/distinfo +++ b/shells/fish/distinfo @@ -1,13 +1,8 @@ -$NetBSD: distinfo,v 1.19 2020/06/14 22:52:10 js Exp $ +$NetBSD: distinfo,v 1.20 2021/03/05 08:47:29 nia Exp $ -SHA1 (fish-3.1.2.tar.gz) = a50886c71ddfe188b63322a557fcbeb5c768930d -RMD160 (fish-3.1.2.tar.gz) = 57cf48d43a8627eb4c7a18e738dc7a68f5e9dd44 -SHA512 (fish-3.1.2.tar.gz) = b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563 -Size (fish-3.1.2.tar.gz) = 6816214 bytes -SHA1 (patch-CMakeLists.txt) = 755c4c79a5a717323046816a7ed36d91ee2552d6 -SHA1 (patch-cmake_ConfigureChecks.cmake) = f673d726b42a60adff60b7e53783a1a2d0e76394 -SHA1 (patch-config__cmake.h.in) = 0d522168dceebb60a0e759df3e2b39595f64d156 -SHA1 (patch-src_common.cpp) = 130e632f41db5974aeec657f0830079b8d9c28ef -SHA1 (patch-src_fallback.cpp) = 021d454b12e1b9ac45b5820236e5b0742f25e20d -SHA1 (patch-src_proc.h) = e8ef91a36e3ee134d3220f2396deee292ff93a40 -SHA1 (patch-src_wutil.cpp) = f016ef23b3e3ad7937e944bf341cc6ce0a3f0257 +SHA1 (fish-3.2.0.tar.xz) = 26817401698aa8ccd7a115a4a251f5988f374fdb +RMD160 (fish-3.2.0.tar.xz) = bc270797b4b73292cc4d7e3b4151ea5fde228f68 +SHA512 (fish-3.2.0.tar.xz) = 4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face +Size (fish-3.2.0.tar.xz) = 3403640 bytes +SHA1 (patch-cmake_Install.cmake) = 6ae3f511597773dfd9bf2d22c2d8dd0b60d87ae2 +SHA1 (patch-src_common.cpp) = f9eac0ae02d1b034b960f9ab24c21f5be7f60fab diff --git a/shells/fish/patches/patch-CMakeLists.txt b/shells/fish/patches/patch-CMakeLists.txt deleted file mode 100644 index a0b76a70bf0..00000000000 --- a/shells/fish/patches/patch-CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2020/06/14 22:52:10 js Exp $ - -Disable code-signing on macOS. - -If fish is code-signed, it fails to load libintl as pkgsrc does not codesign -libintl. - ---- CMakeLists.txt.orig 2020-04-29 02:54:40.000000000 +0000 -+++ CMakeLists.txt -@@ -165,25 +165,9 @@ ADD_DEFINITIONS(-D_REENTRANT) - # Set up PCRE2 - INCLUDE(cmake/PCRE2.cmake) - --# Code signing ID on Mac. A default '-' is ad-hoc codesign. --SET(MAC_CODESIGN_ID "-" CACHE STRING "Mac code-signing identity") -- --FUNCTION(CODESIGN_ON_MAC target) -- IF(APPLE) -- ADD_CUSTOM_COMMAND( -- TARGET ${target} -- POST_BUILD -- COMMAND codesign --force --deep --options runtime --sign "${MAC_CODESIGN_ID}" $<TARGET_FILE:${target}> -- VERBATIM -- ) -- ENDIF() --ENDFUNCTION(CODESIGN_ON_MAC target) -- -- - # Define a function to link dependencies. - FUNCTION(FISH_LINK_DEPS_AND_SIGN target) - TARGET_LINK_LIBRARIES(${target} fishlib) -- CODESIGN_ON_MAC(${target}) - ENDFUNCTION(FISH_LINK_DEPS_AND_SIGN) - - # Define libfish.a. diff --git a/shells/fish/patches/patch-cmake_ConfigureChecks.cmake b/shells/fish/patches/patch-cmake_ConfigureChecks.cmake deleted file mode 100644 index a705df8ec0a..00000000000 --- a/shells/fish/patches/patch-cmake_ConfigureChecks.cmake +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-cmake_ConfigureChecks.cmake,v 1.1 2020/02/18 22:00:49 maya Exp $ - -put #define TPARM_VARARGS to get the varargs tparm. -(For netbsd curses) - -Simply variadic tparm logic, and make sure it doesn't consider the -"solaris (curses) kludge" necessary on netbsd. - ---- cmake/ConfigureChecks.cmake.orig 2020-02-12 14:04:07.000000000 +0000 -+++ cmake/ConfigureChecks.cmake -@@ -158,25 +158,26 @@ int main () { - " - TPARM_TAKES_VARARGS - ) --IF(NOT TPARM_TAKES_VARARGS) -- CHECK_CXX_SOURCE_COMPILES(" --${TPARM_INCLUDES} -+ -+CHECK_CXX_SOURCE_COMPILES(" - #define TPARM_VARARGS -+${TPARM_INCLUDES} - - int main () { - tparm( \"\" ); - } - " -- TPARM_TAKES_VARARGS_WITH_VARARGS -- ) -- IF(NOT TPARM_TAKES_VARARGS) -- SET(TPARM_SOLARIS_KLUDGE 1) -- ELSE() -- SET(TPARM_VARARGS 1) -- ENDIF() --ENDIF() -+ TPARM_TAKES_VARARGS_WITH_VARARGS -+) - CMAKE_POP_CHECK_STATE() - -+IF(TPARM_TAKES_VARARGS) -+ELSEIF(TPARM_TAKES_VARARGS_WITH_VARARGS) -+ SET(TPARM_VARARGS 1) -+ELSE() -+ SET(TPARM_SOLARIS_KLUDGE 1) -+ENDIF() -+ - # Work around the fact that cmake does not propagate the language standard flag into - # the CHECK_CXX_SOURCE_COMPILES function. See CMake issue #16456. - # Ensure we do this after the FIND_PACKAGE calls which use C, and will error on a C++ diff --git a/shells/fish/patches/patch-cmake_Install.cmake b/shells/fish/patches/patch-cmake_Install.cmake new file mode 100644 index 00000000000..603f3a982f2 --- /dev/null +++ b/shells/fish/patches/patch-cmake_Install.cmake @@ -0,0 +1,20 @@ +$NetBSD: patch-cmake_Install.cmake,v 1.1 2021/03/05 08:47:29 nia Exp $ + +pkgsrc-ifying: +Install config files to examples rather than etc. + +--- cmake/Install.cmake.orig 2021-03-01 12:47:02.000000000 +0000 ++++ cmake/Install.cmake +@@ -81,9 +81,9 @@ install(TARGETS ${PROGRAMS} + GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + DESTINATION ${bindir}) + +-fish_create_dirs(${sysconfdir}/fish/conf.d ${sysconfdir}/fish/completions +- ${sysconfdir}/fish/functions) +-install(FILES etc/config.fish DESTINATION ${sysconfdir}/fish/) ++fish_create_dirs(${rel_datadir}/examples/fish/conf.d ${rel_datadir}/examples/fish/completions ++ ${rel_datadir}/examples/fish/functions) ++install(FILES etc/config.fish DESTINATION ${rel_datadir}/examples/fish/) + + fish_create_dirs(${rel_datadir}/fish ${rel_datadir}/fish/completions + ${rel_datadir}/fish/functions ${rel_datadir}/fish/groff diff --git a/shells/fish/patches/patch-config__cmake.h.in b/shells/fish/patches/patch-config__cmake.h.in deleted file mode 100644 index 8aacabee48e..00000000000 --- a/shells/fish/patches/patch-config__cmake.h.in +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-config__cmake.h.in,v 1.1 2020/02/18 22:00:49 maya Exp $ - ---- config_cmake.h.in.orig 2020-02-12 14:04:07.000000000 +0000 -+++ config_cmake.h.in -@@ -144,6 +144,9 @@ - - /* Define to the full name of this package. */ - #define PACKAGE_NAME "fish" -+# -+/* Define to 1 if tparm accepts a fixed amount of parameters. */ -+#cmakedefine TPARM_VARARGS 1 - - /* Define to 1 if tparm accepts a fixed amount of parameters. */ - #cmakedefine TPARM_SOLARIS_KLUDGE 1 diff --git a/shells/fish/patches/patch-src_common.cpp b/shells/fish/patches/patch-src_common.cpp index bd49d91aebd..f29edb5e4f2 100644 --- a/shells/fish/patches/patch-src_common.cpp +++ b/shells/fish/patches/patch-src_common.cpp @@ -1,15 +1,15 @@ -$NetBSD: patch-src_common.cpp,v 1.1 2020/02/18 22:00:49 maya Exp $ +$NetBSD: patch-src_common.cpp,v 1.2 2021/03/05 08:47:29 nia Exp $ Cast to const char*, makes netbsd (const void* dli_saddr) happier. ---- src/common.cpp.orig 2020-02-12 14:04:07.000000000 +0000 +--- src/common.cpp.orig 2021-03-01 12:47:02.000000000 +0000 +++ src/common.cpp -@@ -225,7 +225,7 @@ bool is_windows_subsystem_for_linux() { - swprintf( - text, sizeof(text) / sizeof(wchar_t), L"%-3d %s + %td", i - skip_levels, - status == 0 ? demangled : info.dli_sname == nullptr ? symbols[i] : info.dli_sname, -- static_cast<char *>(callstack[i]) - static_cast<char *>(info.dli_saddr)); -+ static_cast<char *>(callstack[i]) - static_cast<const char *>(info.dli_saddr)); +@@ -212,7 +212,7 @@ bool is_windows_subsystem_for_linux() { + status == 0 ? demangled + : info.dli_sname == nullptr ? symbols[i] + : info.dli_sname, +- static_cast<char *>(callstack[i]) - static_cast<char *>(info.dli_saddr)); ++ static_cast<char *>(callstack[i]) - static_cast<const char *>(info.dli_saddr)); free(demangled); } else { swprintf(text, sizeof(text) / sizeof(wchar_t), L"%-3d %s", i - skip_levels, symbols[i]); diff --git a/shells/fish/patches/patch-src_fallback.cpp b/shells/fish/patches/patch-src_fallback.cpp deleted file mode 100644 index 886fd14e62d..00000000000 --- a/shells/fish/patches/patch-src_fallback.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_fallback.cpp,v 1.3 2020/02/18 22:00:49 maya Exp $ - -constify, for clang - ---- src/fallback.cpp.orig 2020-02-12 14:04:07.000000000 +0000 -+++ src/fallback.cpp -@@ -47,8 +47,8 @@ - #if defined(TPARM_SOLARIS_KLUDGE) - #undef tparm - --char *tparm_solaris_kludge(char *str, long p1, long p2, long p3, long p4, long p5, long p6, long p7, -- long p8, long p9) { -+char *tparm_solaris_kludge(const char *str, long p1, long p2, long p3, long p4, -+ long p5, long p6, long p7, long p8, long p9) { - return tparm(str, p1, p2, p3, p4, p5, p6, p7, p8, p9); - } - diff --git a/shells/fish/patches/patch-src_proc.h b/shells/fish/patches/patch-src_proc.h deleted file mode 100644 index 6e60cb1781a..00000000000 --- a/shells/fish/patches/patch-src_proc.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_proc.h,v 1.1 2020/04/20 00:45:07 joerg Exp $ - -WIFEXITED() is not ICE for legacy reasons, so just skip the assert. - ---- src/proc.h.orig 2020-04-19 18:24:08.756343798 +0000 -+++ src/proc.h -@@ -70,7 +70,9 @@ class proc_status_t { - static proc_status_t from_exit_code(int ret) { - // Some paranoia. - constexpr int zerocode = w_exitcode(0, 0); -+#ifndef __NetBSD__ - static_assert(WIFEXITED(zerocode), "Synthetic exit status not reported as exited"); -+#endif - return proc_status_t(w_exitcode(ret, 0 /* sig */)); - } - diff --git a/shells/fish/patches/patch-src_wutil.cpp b/shells/fish/patches/patch-src_wutil.cpp deleted file mode 100644 index af7181292b9..00000000000 --- a/shells/fish/patches/patch-src_wutil.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_wutil.cpp,v 1.4 2020/02/18 22:00:49 maya Exp $ - -fstatfs appears to be linux-specific, let's not try it on non-linux - ---- src/wutil.cpp.orig 2020-02-12 14:04:07.000000000 +0000 -+++ src/wutil.cpp -@@ -320,7 +320,7 @@ int fd_check_is_remote(int fd) { - struct statvfs buf {}; - if (fstatvfs(fd, &buf) < 0) return -1; - return (buf.f_flag & ST_LOCAL) ? 0 : 1; --#elif defined(MNT_LOCAL) -+#elif defined(MNT_LOCAL) && defined(__linux__) - struct statfs buf {}; - if (fstatfs(fd, &buf) < 0) return -1; - return (buf.f_flags & MNT_LOCAL) ? 0 : 1; |