rework completion functions - read root from environment - enable testing by preferring argv over $(commandline -xpc)
1 file changed, 11 insertions(+), 11 deletions(-)
changed files
M completions/scriptura.fish → completions/scriptura.fish
@@ -3,40 +3,40 @@ complete --command scriptura --no-files complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_print $SCRIPTURA_ROOT)' \ + --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ --short-option h --long-option help \ --description 'Display help information' complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_print $SCRIPTURA_ROOT)' \ + --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ --short-option n --long-option new \ --description 'Create new script' complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_print $SCRIPTURA_ROOT)' \ + --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ --short-option e --long-option edit \ --description 'Edit existing script' complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_print $SCRIPTURA_ROOT)' \ + --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ --short-option c --long-option cat \ --description 'Display script content' complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_print $SCRIPTURA_ROOT)' \ + --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ --short-option w --long-option which \ --description 'Display script path' complete --command scriptura \ - --condition 'not __fish_seen_subcommand_from $(__scriptura_print $SCRIPTURA_ROOT)' \ - --arguments '$(__scriptura_complete $SCRIPTURA_ROOT)' + --condition 'not __fish_seen_subcommand_from $(__scriptura_subcommands)' \ + --arguments '(__scriptura_complete_script)' complete --command scriptura \ - --condition '__fish_seen_subcommand_from $(__scriptura_print $SCRIPTURA_ROOT)' \ - --condition 'not __scriptura_seen_script $(commandline -xpc)' \ --condition 'not __fish_seen_argument --short n --long new' \ - --arguments '$(__scriptura_complete $SCRIPTURA_ROOT $(commandline -xpc))' + --condition '__fish_seen_subcommand_from $(__scriptura_subcommands)' \ + --condition 'not __scriptura_seen_script' \ + --arguments '(__scriptura_complete_script)' complete --command scriptura \ - --condition '__scriptura_seen_script $(commandline -xpc)' \ + --condition __scriptura_seen_script \ --force-files