From 566a673e4f3ef99da1e159de7cd0d33b04f22ab3 Mon Sep 17 00:00:00 2001 From: Ilan Cosman Date: Mon, 22 Nov 2021 19:55:15 -0800 Subject: [PATCH] Run fish_indent on all non-test .fish files --- benchmarks/benchmarks/aliases.fish | 1 - benchmarks/benchmarks/external_cmds.fish | 1 - build_tools/find_globals.fish | 6 +- share/completions/clasp.fish | 36 +-- share/completions/dart.fish | 18 +- share/completions/elvish.fish | 2 +- share/completions/firewall-cmd.fish | 2 +- share/completions/fish_config.fish | 6 +- share/completions/funcsave.fish | 2 +- share/completions/hashcat.fish | 4 +- share/completions/john.fish | 2 +- share/completions/kmutil.fish | 2 +- share/completions/mono.fish | 8 +- share/completions/ng.fish | 36 +-- share/completions/ping.fish | 2 +- share/completions/roswell.fish | 28 +-- share/completions/sbcl.fish | 4 +- share/completions/shortcuts.fish | 2 +- share/completions/snap.fish | 14 +- share/completions/sysctl.fish | 2 +- share/completions/systemd-analyze.fish | 34 +-- share/completions/wineboot.fish | 4 +- share/completions/xbps-query.fish | 62 ++--- .../functions/__fish_complete_mount_opts.fish | 238 +++++++++--------- .../functions/fish_default_key_bindings.fish | 2 +- share/functions/fish_git_prompt.fish | 6 +- share/functions/fish_vi_cursor.fish | 2 +- share/functions/funcsave.fish | 2 +- 28 files changed, 262 insertions(+), 266 deletions(-) diff --git a/benchmarks/benchmarks/aliases.fish b/benchmarks/benchmarks/aliases.fish index b33f87fcd..fdd4f32e2 100644 --- a/benchmarks/benchmarks/aliases.fish +++ b/benchmarks/benchmarks/aliases.fish @@ -1089,4 +1089,3 @@ alias alias1020='something --arg1020' alias alias1021='something --arg1021' alias alias1022='something --arg1022' alias alias1023='something --arg1023' - diff --git a/benchmarks/benchmarks/external_cmds.fish b/benchmarks/benchmarks/external_cmds.fish index 34b3cab40..12048030c 100644 --- a/benchmarks/benchmarks/external_cmds.fish +++ b/benchmarks/benchmarks/external_cmds.fish @@ -1,4 +1,3 @@ for i in (seq 2000) command true end - diff --git a/build_tools/find_globals.fish b/build_tools/find_globals.fish index 260e6f746..1fa1d44ed 100755 --- a/build_tools/find_globals.fish +++ b/build_tools/find_globals.fish @@ -14,8 +14,7 @@ set -g whitelist \ # unclear what this is \ l_constinit \ # hacks to work around missing ncurses strings on mac \ - sitm_esc ritm_esc dim_esc \ - + sitm_esc ritm_esc dim_esc # In our nm regex, we are interested in data (dD) and bss (bB) segments. set -g nm_regex '^([^ ]+) ([dDbB])' @@ -24,8 +23,7 @@ set -l total_globals 0 set -l boring_files \ fish_key_reader.cpp.o \ fish_tests.cpp.o \ - fish_indent.cpp.o \ - + fish_indent.cpp.o # return if we should ignore the given symbol name function should_ignore diff --git a/share/completions/clasp.fish b/share/completions/clasp.fish index 1d5fea873..f901dd56a 100644 --- a/share/completions/clasp.fish +++ b/share/completions/clasp.fish @@ -7,24 +7,24 @@ complete -c clasp -s W -l why -d "Display some debugging info upon exit." complete -c clasp -s h -l help -d "display help for command" # subcommands -complete -f -c clasp -n '__fish_use_subcommand' -xa login -d "Log in to script.google.com" -complete -f -c clasp -n '__fish_use_subcommand' -xa logout -d "Log out" -complete -f -c clasp -n '__fish_use_subcommand' -xa create -d "Create a script" -complete -f -c clasp -n '__fish_use_subcommand' -xa clone -d "Clone a project" -complete -f -c clasp -n '__fish_use_subcommand' -xa pull -d "Fetch a remote project" -complete -f -c clasp -n '__fish_use_subcommand' -xa push -d "Update the remote project" -complete -f -c clasp -n '__fish_use_subcommand' -xa status -d "Lists files that will be pushed by clasp" -complete -f -c clasp -n '__fish_use_subcommand' -xa open -d "Open a script" -complete -f -c clasp -n '__fish_use_subcommand' -xa deployments -d "List deployment ids of a script" -complete -f -c clasp -n '__fish_use_subcommand' -xa deploy -d "Deploy a project" -complete -f -c clasp -n '__fish_use_subcommand' -xa undeploy -d "Undeploy a deployment of a project" -complete -f -c clasp -n '__fish_use_subcommand' -xa version -d "Creates an immutable version of the script" -complete -f -c clasp -n '__fish_use_subcommand' -xa versions -d "List versions of a script" -complete -f -c clasp -n '__fish_use_subcommand' -xa list -d "List App Scripts projects" -complete -f -c clasp -n '__fish_use_subcommand' -xa logs -d "Shows the StackDriver logs" -complete -f -c clasp -n '__fish_use_subcommand' -xa run -d "Run a function in your Apps Scripts project" -complete -f -c clasp -n '__fish_use_subcommand' -xa apis -d "List, enable, or disable APIs" -complete -f -c clasp -n '__fish_use_subcommand' -xa help -d "display help for command" +complete -f -c clasp -n __fish_use_subcommand -xa login -d "Log in to script.google.com" +complete -f -c clasp -n __fish_use_subcommand -xa logout -d "Log out" +complete -f -c clasp -n __fish_use_subcommand -xa create -d "Create a script" +complete -f -c clasp -n __fish_use_subcommand -xa clone -d "Clone a project" +complete -f -c clasp -n __fish_use_subcommand -xa pull -d "Fetch a remote project" +complete -f -c clasp -n __fish_use_subcommand -xa push -d "Update the remote project" +complete -f -c clasp -n __fish_use_subcommand -xa status -d "Lists files that will be pushed by clasp" +complete -f -c clasp -n __fish_use_subcommand -xa open -d "Open a script" +complete -f -c clasp -n __fish_use_subcommand -xa deployments -d "List deployment ids of a script" +complete -f -c clasp -n __fish_use_subcommand -xa deploy -d "Deploy a project" +complete -f -c clasp -n __fish_use_subcommand -xa undeploy -d "Undeploy a deployment of a project" +complete -f -c clasp -n __fish_use_subcommand -xa version -d "Creates an immutable version of the script" +complete -f -c clasp -n __fish_use_subcommand -xa versions -d "List versions of a script" +complete -f -c clasp -n __fish_use_subcommand -xa list -d "List App Scripts projects" +complete -f -c clasp -n __fish_use_subcommand -xa logs -d "Shows the StackDriver logs" +complete -f -c clasp -n __fish_use_subcommand -xa run -d "Run a function in your Apps Scripts project" +complete -f -c clasp -n __fish_use_subcommand -xa apis -d "List, enable, or disable APIs" +complete -f -c clasp -n __fish_use_subcommand -xa help -d "display help for command" # login options complete -c clasp -n '__fish_seen_subcommand_from login' -l no-localhost -d 'Do not run a local server, manually enter code instead' diff --git a/share/completions/dart.fish b/share/completions/dart.fish index d427b618e..3bf36be89 100644 --- a/share/completions/dart.fish +++ b/share/completions/dart.fish @@ -6,15 +6,15 @@ complete -c dart -l enable-analytics -d "Enable analytics." complete -c dart -l disable-analytics -d "Disable analytics." # commands -complete -f -c dart -n '__fish_use_subcommand' -xa analyze -d "Analyze Dart code in a directory." -complete -f -c dart -n '__fish_use_subcommand' -xa compile -d "Compile Dart to various formats." -complete -f -c dart -n '__fish_use_subcommand' -xa create -d "Create a new Dart project." -complete -f -c dart -n '__fish_use_subcommand' -xa fix -d "Apply automated fixes to Dart source code." -complete -f -c dart -n '__fish_use_subcommand' -xa format -d "Idiomatically format Dart source code." -complete -f -c dart -n '__fish_use_subcommand' -xa migrate -d "Perform null safety migration on a project." -complete -f -c dart -n '__fish_use_subcommand' -xa pub -d "Work with packages." -complete -f -c dart -n '__fish_use_subcommand' -xa run -d "Run a Dart program." -complete -f -c dart -n '__fish_use_subcommand' -xa test -d "Run tests for a project." +complete -f -c dart -n __fish_use_subcommand -xa analyze -d "Analyze Dart code in a directory." +complete -f -c dart -n __fish_use_subcommand -xa compile -d "Compile Dart to various formats." +complete -f -c dart -n __fish_use_subcommand -xa create -d "Create a new Dart project." +complete -f -c dart -n __fish_use_subcommand -xa fix -d "Apply automated fixes to Dart source code." +complete -f -c dart -n __fish_use_subcommand -xa format -d "Idiomatically format Dart source code." +complete -f -c dart -n __fish_use_subcommand -xa migrate -d "Perform null safety migration on a project." +complete -f -c dart -n __fish_use_subcommand -xa pub -d "Work with packages." +complete -f -c dart -n __fish_use_subcommand -xa run -d "Run a Dart program." +complete -f -c dart -n __fish_use_subcommand -xa test -d "Run tests for a project." # analyze complete -c dart -n '__fish_seen_subcommand_from analyze' -l fatal-infos -d 'Treat info level issues as fatal.' diff --git a/share/completions/elvish.fish b/share/completions/elvish.fish index 215a62040..e8a8c3751 100644 --- a/share/completions/elvish.fish +++ b/share/completions/elvish.fish @@ -2,7 +2,7 @@ complete -c elvish -o help -d 'Show help and exit' complete -c elvish -o version -d 'Show version and exit' complete -c elvish -o buildinfo -d 'Show build info and exit' -complete -c elvish -s c -o compileonly -d 'Compile' +complete -c elvish -s c -o compileonly -d Compile complete -c elvish -o cpuprofile -d 'Write cpu profile' complete -c elvish -o deprecation-level -f -d 'Warn about deprecated features' complete -c elvish -s i -o json -d 'Show output in JSON' diff --git a/share/completions/firewall-cmd.fish b/share/completions/firewall-cmd.fish index 4abb39458..532950206 100644 --- a/share/completions/firewall-cmd.fish +++ b/share/completions/firewall-cmd.fish @@ -19,7 +19,7 @@ function __fish_print_firewalld_helpers --description "Print list of predefined end function __fish_print_firewalld_protocols --description "Print list of protocols supported by firewalld" - string replace -f -r '^([[:alnum:]]\S*).*' '$1' < /etc/protocols + string replace -f -r '^([[:alnum:]]\S*).*' '$1' " -complete -c ng -n __fish_use_subcommand -a "help" -d "Display help" -complete -c ng -n __fish_use_subcommand -a "lint" -d "Run linter" -complete -c ng -n __fish_use_subcommand -a "new" -d "New workspace" -complete -c ng -n __fish_use_subcommand -a "run" -d "Run Architect" -complete -c ng -n __fish_use_subcommand -a "serve" -d "Start dev server" -complete -c ng -n __fish_use_subcommand -a "test" -d "Run unit tests" -complete -c ng -n __fish_use_subcommand -a "update" -d "Update deps" -complete -c ng -n __fish_use_subcommand -a "version" -d "Display version" +complete -c ng -n __fish_use_subcommand -a add -d "Add dependency" +complete -c ng -n __fish_use_subcommand -a analytics -d "Configure analytics" +complete -c ng -n __fish_use_subcommand -a build -d "Compile Angular app" +complete -c ng -n __fish_use_subcommand -a config -d "get/set config vars" +complete -c ng -n __fish_use_subcommand -a deploy -d "Deploy builder" +complete -c ng -n __fish_use_subcommand -a doc -d "Search documentation" +complete -c ng -n __fish_use_subcommand -a e2e -d "Run e2e tests" +complete -c ng -n __fish_use_subcommand -a extract-i18n -d "Extracts i18n" +complete -c ng -n __fish_use_subcommand -a make-this-awesome -d "" +complete -c ng -n __fish_use_subcommand -a generate -d "Create " +complete -c ng -n __fish_use_subcommand -a help -d "Display help" +complete -c ng -n __fish_use_subcommand -a lint -d "Run linter" +complete -c ng -n __fish_use_subcommand -a new -d "New workspace" +complete -c ng -n __fish_use_subcommand -a run -d "Run Architect" +complete -c ng -n __fish_use_subcommand -a serve -d "Start dev server" +complete -c ng -n __fish_use_subcommand -a test -d "Run unit tests" +complete -c ng -n __fish_use_subcommand -a update -d "Update deps" +complete -c ng -n __fish_use_subcommand -a version -d "Display version" diff --git a/share/completions/ping.fish b/share/completions/ping.fish index 1be272462..93c49bea8 100644 --- a/share/completions/ping.fish +++ b/share/completions/ping.fish @@ -79,7 +79,7 @@ switch $ping_version complete -c ping -s I -d "Source interface or IP address" -xa "(__fish_print_interfaces; __fish_print_addresses)" complete -c ping -s W -d "Seconds to wait for the first response" -x complete -c ping -s w -d "Seconds until ping exits" -x - complete -c ping -s q -d "Quiet" + complete -c ping -s q -d Quiet complete -c ping -s p -d "Payload pattern" -x case '*' diff --git a/share/completions/roswell.fish b/share/completions/roswell.fish index 651a38ef2..d6c9f9bde 100644 --- a/share/completions/roswell.fish +++ b/share/completions/roswell.fish @@ -1,17 +1,17 @@ ### subcommands -complete -f -c ros -n '__fish_use_subcommand' -xa run -d "Run repl" -complete -f -c ros -n '__fish_use_subcommand' -xa install -d "Install a given implementation or a system for roswell environment" -complete -f -c ros -n '__fish_use_subcommand' -xa update -d "Update installed systems." -complete -f -c ros -n '__fish_use_subcommand' -xa build -d "Make executable from script." -complete -f -c ros -n '__fish_use_subcommand' -xa use -d "Change default implementation." -complete -f -c ros -n '__fish_use_subcommand' -xa init -d "Creates a new ros script, optionally based on a template." -complete -f -c ros -n '__fish_use_subcommand' -xa fmt -d "Indent lisp source." -complete -f -c ros -n '__fish_use_subcommand' -xa list -d "List Information" -complete -f -c ros -n '__fish_use_subcommand' -xa template -d "Manage templates" -complete -f -c ros -n '__fish_use_subcommand' -xa delete -d "Delete installed implementations" -complete -f -c ros -n '__fish_use_subcommand' -xa config -d "Get and set options" -complete -f -c ros -n '__fish_use_subcommand' -xa version -d "Show the roswell version information" -complete -f -c ros -n '__fish_use_subcommand' -xa help -d "Use \"ros help [command]\" for more information about a command." +complete -f -c ros -n __fish_use_subcommand -xa run -d "Run repl" +complete -f -c ros -n __fish_use_subcommand -xa install -d "Install a given implementation or a system for roswell environment" +complete -f -c ros -n __fish_use_subcommand -xa update -d "Update installed systems." +complete -f -c ros -n __fish_use_subcommand -xa build -d "Make executable from script." +complete -f -c ros -n __fish_use_subcommand -xa use -d "Change default implementation." +complete -f -c ros -n __fish_use_subcommand -xa init -d "Creates a new ros script, optionally based on a template." +complete -f -c ros -n __fish_use_subcommand -xa fmt -d "Indent lisp source." +complete -f -c ros -n __fish_use_subcommand -xa list -d "List Information" +complete -f -c ros -n __fish_use_subcommand -xa template -d "Manage templates" +complete -f -c ros -n __fish_use_subcommand -xa delete -d "Delete installed implementations" +complete -f -c ros -n __fish_use_subcommand -xa config -d "Get and set options" +complete -f -c ros -n __fish_use_subcommand -xa version -d "Show the roswell version information" +complete -f -c ros -n __fish_use_subcommand -xa help -d "Use \"ros help [command]\" for more information about a command." ### help set -l __roswell_helps "run install update build use init fmt list template delete config version" @@ -49,7 +49,7 @@ complete -c ros -n '__fish_seen_subcommand_from run' -l write -d 'evaluate and w complete -c ros -n '__fish_seen_subcommand_from run' -s F -d 'evaluate FORM before dumping IMAGE' complete -c ros -n '__fish_seen_subcommand_from run' -l final -d 'evaluate FORM before dumping IMAGE' complete -c ros -n '__fish_seen_subcommand_from run' -a +R -d 'skip /etc/rosrc, ~/.roswell/init.lisp' -complete -c ros -n '__fish_seen_subcommand_from run' -l "no-rc" -d 'skip /etc/rosrc, ~/.roswell/init.lisp' +complete -c ros -n '__fish_seen_subcommand_from run' -l no-rc -d 'skip /etc/rosrc, ~/.roswell/init.lisp' complete -c ros -n '__fish_seen_subcommand_from run' -s A -d 'use new asdf' complete -c ros -n '__fish_seen_subcommand_from run' -l asdf -d 'use new asdf' complete -c ros -n '__fish_seen_subcommand_from run' -a +Q -d 'do not use quicklisp' diff --git a/share/completions/sbcl.fish b/share/completions/sbcl.fish index ea45440f6..610656529 100644 --- a/share/completions/sbcl.fish +++ b/share/completions/sbcl.fish @@ -1,6 +1,6 @@ complete -c sbcl -l help -d "Print this message and exit." -complete -c sbcl -l version -d "Print version information and exit." -complete -c sbcl -l core -d "Use the specified core file instead of the default." +complete -c sbcl -l version -d "Print version information and exit." +complete -c sbcl -l core -d "Use the specified core file instead of the default." complete -c sbcl -l dynamic-space-size -d "Size of reserved dynamic space in megabytes." complete -c sbcl -l control-stack-size -d "Size of reserved control stack in megabytes." complete -c sbcl -l tls-limit -d "Maximum number of thread-local symbols." diff --git a/share/completions/shortcuts.fish b/share/completions/shortcuts.fish index e1c4e8d34..a9513fed6 100644 --- a/share/completions/shortcuts.fish +++ b/share/completions/shortcuts.fish @@ -6,7 +6,7 @@ # checking the path is as expected is about as far as we're going with validation if [ (command -v shortcuts) = /usr/bin/shortcuts ] - command shortcuts --generate-completion-script=fish | source + command shortcuts --generate-completion-script=fish | source end # output is like: diff --git a/share/completions/snap.fish b/share/completions/snap.fish index db99c9950..68f4e7a3e 100644 --- a/share/completions/snap.fish +++ b/share/completions/snap.fish @@ -2,9 +2,9 @@ function __fish_snap_no_subcommand -d 'Test if snap has yet to be given the subcommand' for i in (commandline -opc) - if contains -- $i abort ack alias aliases buy changes connect disable disconnect download\ - enable find get help info install interfaces known list login logout prefer refresh remove\ - revert run set tasks try unalias version watch + if contains -- $i abort ack alias aliases buy changes connect disable disconnect download \ + enable find get help info install interfaces known list login logout prefer refresh remove \ + revert run set tasks try unalias version watch return 1 end end @@ -81,8 +81,8 @@ end function __fish_snap_no_assertion -d 'Check that no assertion type is used yet' for i in (commandline -opc) - if contains -- $i account account-key model serial snap-declaration snap-build snap-revision\ - system-user validation + if contains -- $i account account-key model serial snap-declaration snap-build snap-revision \ + system-user validation return 1 end end @@ -102,8 +102,8 @@ function __fish_snap_assertion set -l assertion $argv[1] set -e argv[1] complete -f -c snap -n '__fish_snap_using_subcommand known; and __fish_snap_no_assertion' -a $assertion - complete -f -c snap -n "__fish_snap_using_assertion $assertion" -a "(__fish_snap_filters $assertion)"\ - -d Filter + complete -f -c snap -n "__fish_snap_using_assertion $assertion" -a "(__fish_snap_filters $assertion)" \ + -d Filter end function __fish_snap_filters -d 'List assertion filters' diff --git a/share/completions/sysctl.fish b/share/completions/sysctl.fish index c78f8c276..6ea422d56 100644 --- a/share/completions/sysctl.fish +++ b/share/completions/sysctl.fish @@ -12,7 +12,7 @@ if sysctl -h >/dev/null 2>/dev/null complete -c sysctl -s N -l names -d 'Only print names' complete -c sysctl -s q -l quiet -d 'Be quiet when setting values' complete -c sysctl -s w -l write -d 'Write value' - complete -c sysctl -s p -l load -d 'Load in sysctl settings from the file specified or /etc/sysctl' + complete -c sysctl -s p -l load -d 'Load in sysctl settings from the file specified or /etc/sysctl' complete -c sysctl -s a -l all -d 'Display all values currently available' complete -c sysctl -l deprecated -d 'Include deprecated parameters too' complete -c sysctl -s b -l binary -d 'Print value without new line' diff --git a/share/completions/systemd-analyze.fish b/share/completions/systemd-analyze.fish index 32fd89943..5d8c59059 100644 --- a/share/completions/systemd-analyze.fish +++ b/share/completions/systemd-analyze.fish @@ -27,29 +27,29 @@ complete -c systemd-analyze -l no-pager -d 'Do not pipe output into a pager' # subcommands -complete -c systemd-analyze -n "__fish_use_subcommand" -a time -d "Print timing statistics" -complete -c systemd-analyze -n "__fish_use_subcommand" -a blame -d "Print list of running units ordered by time to init" +complete -c systemd-analyze -n __fish_use_subcommand -a time -d "Print timing statistics" +complete -c systemd-analyze -n __fish_use_subcommand -a blame -d "Print list of running units ordered by time to init" -complete -c systemd-analyze -n "__fish_use_subcommand" -a critical-chain -d "Print a tree of the time critical chain of units" +complete -c systemd-analyze -n __fish_use_subcommand -a critical-chain -d "Print a tree of the time critical chain of units" complete -c systemd-analyze -n "__fish_seen_subcommand_from critical-chain" -a "(__fish_systemd_units)" -complete -c systemd-analyze -n "__fish_use_subcommand" -a dump -d "Output serialization of server state" -complete -c systemd-analyze -n "__fish_use_subcommand" -a plot -d "Output SVG graphic showing service initialization" -complete -c systemd-analyze -n "__fish_use_subcommand" -a dot -d "Output dependency graph in dot(1) format" -complete -c systemd-analyze -n "__fish_use_subcommand" -a unit-paths -d "List all directories from which unit files may be loaded" -complete -c systemd-analyze -n "__fish_use_subcommand" -a exit-status -d "List exit statuses along with their class" -complete -c systemd-analyze -n "__fish_use_subcommand" -a capability -d "List Linux capabilities along with their numeric IDs" -complete -c systemd-analyze -n "__fish_use_subcommand" -a condition -d "Evaluate Condition and Assert assignments" -complete -c systemd-analyze -n "__fish_use_subcommand" -a syscall-filter -d "List system calls contained in the specified system call set" -complete -c systemd-analyze -n "__fish_use_subcommand" -a calendar -d "Normalize repetitive calendar events and calculate when they elapse next" -complete -c systemd-analyze -n "__fish_use_subcommand" -a timestamp -d "Parse timestamp and output the normalized form" -complete -c systemd-analyze -n "__fish_use_subcommand" -a timestamp -d "Parse time span and output the normalized form" +complete -c systemd-analyze -n __fish_use_subcommand -a dump -d "Output serialization of server state" +complete -c systemd-analyze -n __fish_use_subcommand -a plot -d "Output SVG graphic showing service initialization" +complete -c systemd-analyze -n __fish_use_subcommand -a dot -d "Output dependency graph in dot(1) format" +complete -c systemd-analyze -n __fish_use_subcommand -a unit-paths -d "List all directories from which unit files may be loaded" +complete -c systemd-analyze -n __fish_use_subcommand -a exit-status -d "List exit statuses along with their class" +complete -c systemd-analyze -n __fish_use_subcommand -a capability -d "List Linux capabilities along with their numeric IDs" +complete -c systemd-analyze -n __fish_use_subcommand -a condition -d "Evaluate Condition and Assert assignments" +complete -c systemd-analyze -n __fish_use_subcommand -a syscall-filter -d "List system calls contained in the specified system call set" +complete -c systemd-analyze -n __fish_use_subcommand -a calendar -d "Normalize repetitive calendar events and calculate when they elapse next" +complete -c systemd-analyze -n __fish_use_subcommand -a timestamp -d "Parse timestamp and output the normalized form" +complete -c systemd-analyze -n __fish_use_subcommand -a timestamp -d "Parse time span and output the normalized form" -complete -c systemd-analyze -n "__fish_use_subcommand" -a cat-config -d "Show contents of a config file" +complete -c systemd-analyze -n __fish_use_subcommand -a cat-config -d "Show contents of a config file" complete -c systemd-analyze -n "__fish_seen_subcommand_from cat-config" -F -complete -c systemd-analyze -n "__fish_use_subcommand" -a verify -d "Check unit files for correctness" +complete -c systemd-analyze -n __fish_use_subcommand -a verify -d "Check unit files for correctness" complete -c systemd-analyze -n "__fish_seen_subcommand_from verify" -F -complete -c systemd-analyze -n "__fish_use_subcommand" -a security -d "Analyze security settings of specified service units" +complete -c systemd-analyze -n __fish_use_subcommand -a security -d "Analyze security settings of specified service units" complete -c systemd-analyze -n "__fish_seen_subcommand_from security" -a "(__fish_systemctl_services)" diff --git a/share/completions/wineboot.fish b/share/completions/wineboot.fish index 876afc584..c1e48b791 100644 --- a/share/completions/wineboot.fish +++ b/share/completions/wineboot.fish @@ -3,6 +3,6 @@ complete -c wineboot -s e -l end-session -d 'End current session cleanly' complete -c wineboot -s f -l force -d 'Force exit processes don\'t exit cleanly' complete -c wineboot -s i -l init -d 'Perform initialization for first Wine instance' complete -c wineboot -s k -l kill -d 'Kill processes without cleanup' -complete -c wineboot -s r -l restart -d 'Restart' -complete -c wineboot -s s -l shutdown -d 'Shutdown' +complete -c wineboot -s r -l restart -d Restart +complete -c wineboot -s s -l shutdown -d Shutdown complete -c wineboot -s u -l update -d 'Update wineprefix directory' diff --git a/share/completions/xbps-query.fish b/share/completions/xbps-query.fish index de10824aa..4757035b5 100644 --- a/share/completions/xbps-query.fish +++ b/share/completions/xbps-query.fish @@ -7,37 +7,37 @@ set -l listall "(__fish_print_xbps_packages)" set -l listinstalled "(__fish_print_xbps_packages -i)" function __fish_print_xbps_pkg_props - printf 'alternatives\tList of alternatives provided by the package\n' - printf 'architecture\tArchitecture of machine\n' - printf 'archive-compression-type\tType of archive\'s compression format\n' - printf 'automatic-install\tWas the package installed automatically\n' - printf 'build-options\tOptions used to build the package\n' - printf 'conf_files\tList of provided system configuration files\n' - printf 'conflicts\tList of packages the package conflicts with\n' - printf 'filename-sha256\tFilename\'s sha256\n' - printf 'filename-size\tFilename\'s size\n' - printf 'homepage\tHomepage of the package\n' - printf 'install-date\tDate the package was installed\n' - printf 'install-msg\tMessage printed during installation\n' - printf 'install-script\tPrint the package\'s install script\n' - printf 'installed_size\tSize of the package\n' - printf 'license\tLicense of the package\n' - printf 'maintainer\tMaintainer of the package\n' - printf 'metafile-sha256\tMetafile\'s sha256\n' - printf 'pkgver\tThe package\'s name/version tuple\n' - printf 'preserve\tWill files be preserved after update\n' - printf 'provides\tList of virtual packages provided by the package\n' - printf 'remove-msg\tMessage printed during removal\n' - printf 'remove-script\tPrint the package\'s removal script\n' - printf 'replaces\tList of packages the package replaces\n' - printf 'repository\tRepo where package was downloaded from\n' - printf 'run_depends\tList of packages required to run the package\n' - printf 'reverts\tList of versions the package reverts\n' - printf 'shlib-provides\tList of provided shared libraries\n' - printf 'shlib-requires\tList of required shared libraries\n' - printf 'short_desc\tShort description of the package\n' - printf 'source-revisions\tGit revision used to build the package\n' - printf 'state\tState of the package\n' + printf 'alternatives\tList of alternatives provided by the package\n' + printf 'architecture\tArchitecture of machine\n' + printf 'archive-compression-type\tType of archive\'s compression format\n' + printf 'automatic-install\tWas the package installed automatically\n' + printf 'build-options\tOptions used to build the package\n' + printf 'conf_files\tList of provided system configuration files\n' + printf 'conflicts\tList of packages the package conflicts with\n' + printf 'filename-sha256\tFilename\'s sha256\n' + printf 'filename-size\tFilename\'s size\n' + printf 'homepage\tHomepage of the package\n' + printf 'install-date\tDate the package was installed\n' + printf 'install-msg\tMessage printed during installation\n' + printf 'install-script\tPrint the package\'s install script\n' + printf 'installed_size\tSize of the package\n' + printf 'license\tLicense of the package\n' + printf 'maintainer\tMaintainer of the package\n' + printf 'metafile-sha256\tMetafile\'s sha256\n' + printf 'pkgver\tThe package\'s name/version tuple\n' + printf 'preserve\tWill files be preserved after update\n' + printf 'provides\tList of virtual packages provided by the package\n' + printf 'remove-msg\tMessage printed during removal\n' + printf 'remove-script\tPrint the package\'s removal script\n' + printf 'replaces\tList of packages the package replaces\n' + printf 'repository\tRepo where package was downloaded from\n' + printf 'run_depends\tList of packages required to run the package\n' + printf 'reverts\tList of versions the package reverts\n' + printf 'shlib-provides\tList of provided shared libraries\n' + printf 'shlib-requires\tList of required shared libraries\n' + printf 'short_desc\tShort description of the package\n' + printf 'source-revisions\tGit revision used to build the package\n' + printf 'state\tState of the package\n' end complete -c $progname -f diff --git a/share/functions/__fish_complete_mount_opts.fish b/share/functions/__fish_complete_mount_opts.fish index 4dc449282..21be69d2b 100644 --- a/share/functions/__fish_complete_mount_opts.fish +++ b/share/functions/__fish_complete_mount_opts.fish @@ -17,125 +17,125 @@ function __fish_print_group_ids end function __fish_complete_mount_opts - set -l fish_mount_opts\ - async\t'Use asynchronous I/O'\ - atime\t'Update time on each access'\ - noatime\t'Do not update time on each access'\ - auto\t'Mounted with'\ - noauto\t'Not mounted by -a'\ - defaults\t'Use default options'\ - dev\t'Interpret character/block special devices'\ - nodev\t'Do not interpret character/block special devices'\ - diratime\t'Update directory inode access time'\ - nodiratime\t'Don\'t update directory inode access time'\ - dirsync\t'Use synchronous directory operations'\ - exec\t'Permit executables'\ - noexec\t'Do not permit executables'\ - group\t'Any user within device group may mount'\ - iversion\t'Increment i_version field on inode modification'\ - noiversion\t'Don\'t increment i_version field on inode modification'\ - mand\t'Allow mandatory locks'\ - nomand\t'Don\'t allow mandatory locks'\ - _netdev\t'Filesystem uses network'\ - nofail\t'Don\'t report errors'\ - relatime\t'Update inode access times'\ - norelatime\t'Don\'t update inode access times'\ - strictatime\ - nostrictatime\ - lazytime\ - nolazytime\ - suid\t'Allow suid bits'\ - nosuid\t'Ignore suid bits'\ - silent\ - loud\ - owner\ - remount\t'Remount read-only filesystem'\ - ro\t'Mount read-only'\ - rw\t'Mount read-write'\ - sync\t'Use synchronous I/O'\ - user\t'Any user may mount'\ - nouser\t'Only root may mount'\ - users\t'Any user may mount and unmount'\ - protect\ - usemp\ - verbose\ - {grp,no,usr,}quota\ - autodefrag\ - compress\ - compress-force\ - degraded\ - discard\ - enospc_debug\ - flushoncommit\ - inode_cache\ - context=\t'Set SELinux context'\ - uid=\ - gid=\ - ownmask=\ - othmask=\ - setuid=\ - setgid=\ - mode=\ - prefix=\ - volume=\ - reserved=\ - root=\ - bs=\ - alloc_start=\ - check_int{,_data,_print,_mask}=\ - commit=\ - compress=\ - compress-force=\ - device=\ - fatal_errors=\ - max_inline=\ - metadata_ratio=\ - noacl\ - nobarrier\ - nodatacow\ - nodatasum\ - notreelog\ - recovery\ - rescan_uuid_tree\ - skip_balance\ - nospace_cache\ - clear_cache\ - ssd\ - nossd\ - ssd_spread\ - subvol=\ - subvolrootid=\ - thread_pool=\ - user_subvol_rm_allowed\ - acl\ - noacl\ - bsddf\ - minixdf\ - check=none\ - nocheck\ - debug\ - errors={continue,remount-ro,panic}\ - grpid\ - bsdgroups\ - bsdgroups\ - bsdgroups\ - nouid32\ - grpquota\ - grpquota\ - resgid=\ - resuid=\ - sb=\ - {user,nouser}_xattr\ - journal={update,unum}\ - journal{_dev,_path}=\ - norecovery\ - noload\ - data={journal,ordered,writeback}\ - data_err={ignore,abort}\ - barrier={0,1}\ - user_xattr\ - acl\ - set -l token (commandline -tc | string replace -r '^-o' -- '') + set -l fish_mount_opts \ + async\t'Use asynchronous I/O' \ + atime\t'Update time on each access' \ + noatime\t'Do not update time on each access' \ + auto\t'Mounted with' \ + noauto\t'Not mounted by -a' \ + defaults\t'Use default options' \ + dev\t'Interpret character/block special devices' \ + nodev\t'Do not interpret character/block special devices' \ + diratime\t'Update directory inode access time' \ + nodiratime\t'Don\'t update directory inode access time' \ + dirsync\t'Use synchronous directory operations' \ + exec\t'Permit executables' \ + noexec\t'Do not permit executables' \ + group\t'Any user within device group may mount' \ + iversion\t'Increment i_version field on inode modification' \ + noiversion\t'Don\'t increment i_version field on inode modification' \ + mand\t'Allow mandatory locks' \ + nomand\t'Don\'t allow mandatory locks' \ + _netdev\t'Filesystem uses network' \ + nofail\t'Don\'t report errors' \ + relatime\t'Update inode access times' \ + norelatime\t'Don\'t update inode access times' \ + strictatime \ + nostrictatime \ + lazytime \ + nolazytime \ + suid\t'Allow suid bits' \ + nosuid\t'Ignore suid bits' \ + silent \ + loud \ + owner \ + remount\t'Remount read-only filesystem' \ + ro\t'Mount read-only' \ + rw\t'Mount read-write' \ + sync\t'Use synchronous I/O' \ + user\t'Any user may mount' \ + nouser\t'Only root may mount' \ + users\t'Any user may mount and unmount' \ + protect \ + usemp \ + verbose \ + {grp,no,usr,}quota \ + autodefrag \ + compress \ + compress-force \ + degraded \ + discard \ + enospc_debug \ + flushoncommit \ + inode_cache \ + context=\t'Set SELinux context' \ + uid= \ + gid= \ + ownmask= \ + othmask= \ + setuid= \ + setgid= \ + mode= \ + prefix= \ + volume= \ + reserved= \ + root= \ + bs= \ + alloc_start= \ + check_int{,_data,_print,_mask}= \ + commit= \ + compress= \ + compress-force= \ + device= \ + fatal_errors= \ + max_inline= \ + metadata_ratio= \ + noacl \ + nobarrier \ + nodatacow \ + nodatasum \ + notreelog \ + recovery \ + rescan_uuid_tree \ + skip_balance \ + nospace_cache \ + clear_cache \ + ssd \ + nossd \ + ssd_spread \ + subvol= \ + subvolrootid= \ + thread_pool= \ + user_subvol_rm_allowed \ + acl \ + noacl \ + bsddf \ + minixdf \ + check=none \ + nocheck \ + debug \ + errors={continue,remount-ro,panic} \ + grpid \ + bsdgroups \ + bsdgroups \ + bsdgroups \ + nouid32 \ + grpquota \ + grpquota \ + resgid= \ + resuid= \ + sb= \ + {user,nouser}_xattr \ + journal={update,unum} \ + journal{_dev,_path}= \ + norecovery \ + noload \ + data={journal,ordered,writeback} \ + data_err={ignore,abort} \ + barrier={0,1} \ + user_xattr \ + acl \ + set -l token (commandline -tc | string replace -r '^-o' -- '') set -l args (string split , -- $token) if test (count $args) -ne 0 diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish index b1f71d11d..f9597d487 100644 --- a/share/functions/fish_default_key_bindings.fish +++ b/share/functions/fish_default_key_bindings.fish @@ -111,7 +111,7 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis # term-specific special bindings switch "$TERM" - case 'st-256color' + case st-256color # suckless and bash/zsh/fish have a different approach to how the terminal should be configured; # the major effect is that several keys do not work as intended. # This is a workaround, there will be additions in he future. diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish index edad6be56..700d65cd8 100644 --- a/share/functions/fish_git_prompt.fish +++ b/share/functions/fish_git_prompt.fish @@ -611,7 +611,7 @@ function __fish_git_prompt_validate_colors --description "fish_git_prompt helper end function __fish_git_prompt_reset -a type -a op -a var --description "Event handler, resets prompt when functionality changes" \ ---on-variable=__fish_git_prompt_{repaint,describe_style,show_informative_status,use_informative_chars,showdirtystate,showstashstate,showuntrackedfiles,showupstream} + --on-variable=__fish_git_prompt_{repaint,describe_style,show_informative_status,use_informative_chars,showdirtystate,showstashstate,showuntrackedfiles,showupstream} if status --is-interactive if contains -- $var __fish_git_prompt_show_informative_status __fish_git_prompt_use_informative_chars # Clear characters that have different defaults with/without informative status @@ -623,7 +623,7 @@ function __fish_git_prompt_reset -a type -a op -a var --description "Event handl end function __fish_git_prompt_reset_color -a type -a op -a var --description "Event handler, resets prompt when any color changes" \ ---on-variable=__fish_git_prompt_color{'',_prefix,_suffix,_bare,_merging,_cleanstate,_invalidstate,_upstream,_flags,_branch,_dirtystate,_stagedstate,_branch_detached,_stashstate,_untrackedfiles} --on-variable=__fish_git_prompt_showcolorhints + --on-variable=__fish_git_prompt_color{'',_prefix,_suffix,_bare,_merging,_cleanstate,_invalidstate,_upstream,_flags,_branch,_dirtystate,_stagedstate,_branch_detached,_stashstate,_untrackedfiles} --on-variable=__fish_git_prompt_showcolorhints if status --is-interactive set -e _$var set -e _{$var}_done @@ -636,7 +636,7 @@ function __fish_git_prompt_reset_color -a type -a op -a var --description "Event end function __fish_git_prompt_reset_char -a type -a op -a var --description "Event handler, resets prompt when any char changes" \ ---on-variable=__fish_git_prompt_char_{cleanstate,dirtystate,invalidstate,stagedstate,stashstate,stateseparator,untrackedfiles,upstream_ahead,upstream_behind,upstream_diverged,upstream_equal,upstream_prefix} + --on-variable=__fish_git_prompt_char_{cleanstate,dirtystate,invalidstate,stagedstate,stashstate,stateseparator,untrackedfiles,upstream_ahead,upstream_behind,upstream_diverged,upstream_equal,upstream_prefix} if status --is-interactive set -e ___fish_git_prompt_init set -e _$var diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish index 1efabbed0..12e099397 100644 --- a/share/functions/fish_vi_cursor.fish +++ b/share/functions/fish_vi_cursor.fish @@ -46,7 +46,7 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes' and not set -q VTE_VERSION # which version is already checked above and not set -q WT_PROFILE_ID and not set -q XTERM_VERSION - and not string match -q "Apple_Terminal" -- $TERM_PROGRAM + and not string match -q Apple_Terminal -- $TERM_PROGRAM and not string match -rq '^st(-.*)$' -- $TERM and not string match -q 'xterm-kitty*' -- $TERM and not string match -q 'rxvt*' -- $TERM diff --git a/share/functions/funcsave.fish b/share/functions/funcsave.fish index e9bb66e1b..f78a06b78 100644 --- a/share/functions/funcsave.fish +++ b/share/functions/funcsave.fish @@ -32,7 +32,7 @@ function funcsave --description "Save the current definition of all specified fu and set -q _flag_quiet || printf (_ "%s: wrote %s\n") funcsave $funcpath else if [ -w $funcpath ] rm $funcpath - and set -q _flag_quiet || printf (_ "%s: removed %s\n") funcsave $funcpath + and set -q _flag_quiet || printf (_ "%s: removed %s\n") funcsave $funcpath else printf (_ "%s: Unknown function '%s'\n") funcsave $funcname >&2 set retval 1