re-work to use subcommands instead of flags
1 file changed, 33 insertions(+), 19 deletions(-)
changed files
M completions/scriptura.fish → completions/scriptura.fish
@@ -1,52 +1,66 @@ set --query SCRIPTURA_ROOT or set --local SCRIPTURA_ROOT "~/sd" +set --local subcommands run help edit cat which + +complete --command scriptura --erase + complete --command scriptura --no-files complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ - --short-option h --long-option help \ - --description 'Display help information' + --condition __fish_use_subcommand \ + --exclusive \ + --description 'Run a script' \ + --arguments run complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ - --short-option n --long-option new \ - --description 'Create new script' + --condition __fish_use_subcommand \ + --exclusive \ + --description 'Display help information' \ + --arguments help complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ - --short-option e --long-option edit \ - --description 'Edit existing script' + --condition __fish_use_subcommand \ + --exclusive \ + --description 'Create new script' \ + --arguments new complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ - --short-option c --long-option cat \ - --description 'Display script content' + --condition __fish_use_subcommand \ + --exclusive \ + --description 'Edit existing script' \ + --arguments edit complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ - --short-option w --long-option which \ - --description 'Display script path' + --condition __fish_use_subcommand \ + --exclusive \ + --description 'Display script content' \ + --arguments cat complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ - --arguments '(__scriptura_complete_script)' + --condition __fish_use_subcommand \ + --exclusive \ + --description 'Display script path' \ + --arguments which complete --command scriptura \ - --condition '__fish_seen_subcommand_from $(__scriptura_subcommands)' \ + --condition "__fish_seen_subcommand_from $subcommands new (__scriptura_subcommands)" \ --condition 'not __scriptura_seen_script' \ --arguments '(__scriptura_complete_script)' complete --command scriptura \ + --condition "__fish_seen_subcommand_from $subcommands new (__scriptura_subcommands)" \ --condition __scriptura_seen_script \ --condition 'not contains -- "--" (commandline -xpc)' \ --arguments -- complete --command scriptura \ + --condition "__fish_seen_subcommand_from $subcommands (__scriptura_subcommands)" \ --condition __scriptura_seen_script \ --condition 'contains -- "--" (commandline -xpc)' \ --force-files complete --command scriptura \ - --condition '__fish_seen_argument --short n --long new' \ + --condition '__fish_seen_subcommand_from new' \ --condition __scriptura_seen_script \ + --condition 'contains -- "--" (commandline -xpc)' \ --arguments '(__scriptura_complete_new)'