aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/c_defs.go1
-rw-r--r--src/c_fuzz.go12
-rw-r--r--src/c_init.go3
-rw-r--r--src/c_parse.go4
4 files changed, 14 insertions, 6 deletions
diff --git a/src/c_defs.go b/src/c_defs.go
index fc6c4c2..cc8a42f 100644
--- a/src/c_defs.go
+++ b/src/c_defs.go
@@ -240,6 +240,7 @@ var DEFAULT_OPTS = HardOpts{
false,
"",
"",
+ "fzf",
"",
}
diff --git a/src/c_fuzz.go b/src/c_fuzz.go
index 313b684..5dd7880 100644
--- a/src/c_fuzz.go
+++ b/src/c_fuzz.go
@@ -98,24 +98,30 @@ func c_fuzz(data *HardData, ui *HardUI) (bool) {
return false
}
}
- search := exec.Command("fzf")
+ search := exec.Command(data.opts.Fuzzer)
stdin, stdout := c_fuzz_init_pipes(ui, search)
if stdin == nil || stdout == nil {
return false
}
if err := search.Start(); err != nil {
if ui.s != nil {
- c_error_mode("fzf", err, ui)
+ c_error_mode("fuzzy finder", err, ui)
c_resume_or_die(ui)
return false
} else {
- c_die("fzf", err)
+ c_die("fuzzy finder", err)
}
}
go func() {
defer stdin.Close()
for ptr := data.litems.head; ptr != nil; ptr = ptr.next {
if ptr.is_dir() == true {
+ // } else if data.litems.curr.Dirs != nil &&
+ // data.folds[data.litems.curr.Dirs] == nil {
+ // e_fold_dir(data, data.litems.curr)
+ // } else {
+ // e_unfold_dir(data, data.litems.curr)
+ // }
continue
}
io.WriteString(stdin, ptr.path()[1:] + ptr.Host.Name + "\n")
diff --git a/src/c_init.go b/src/c_init.go
index c2c7779..555fb96 100644
--- a/src/c_init.go
+++ b/src/c_init.go
@@ -66,6 +66,7 @@ type HardOpts struct {
Perc bool `yaml:"percent"`
Term string `yaml:"terminal"`
DefSSH string `yaml:"default_ssh_priv"`
+ Fuzzer string `yaml:"fuzzy_finder"`
file string
}
@@ -185,7 +186,7 @@ func c_get_options(dir string, load_err *[]error) HardOpts {
opts.file = file
return opts
}
- opts, err := c_parse_opts(file)
+ opts, err := c_parse_opts(file, opts)
opts.file = file
if err != nil {
*load_err = append(*load_err, err)
diff --git a/src/c_parse.go b/src/c_parse.go
index 5f788e9..2b5950f 100644
--- a/src/c_parse.go
+++ b/src/c_parse.go
@@ -59,8 +59,8 @@ import (
"gopkg.in/yaml.v3"
)
-func c_parse_opts(file string) (HardOpts, error) {
- var opts HardOpts
+func c_parse_opts(file string, defaults HardOpts) (HardOpts, error) {
+ opts := defaults
yaml_file, err := os.ReadFile(file)
if err != nil {