diff options
Diffstat (limited to 'runner/shell')
| -rw-r--r-- | runner/shell/hydrated.go | 14 | ||||
| -rw-r--r-- | runner/shell/target.go | 4 |
2 files changed, 4 insertions, 14 deletions
diff --git a/runner/shell/hydrated.go b/runner/shell/hydrated.go index fec74f1..440d9cd 100644 --- a/runner/shell/hydrated.go +++ b/runner/shell/hydrated.go @@ -1,7 +1,6 @@ package shell import ( - "errors" "github.com/ewy1/pik/describe" "github.com/ewy1/pik/model" "github.com/ewy1/pik/runner" @@ -19,19 +18,8 @@ func (h *Hydrated) Icon() string { func (h *Hydrated) Description(src *model.HydratedSource) string { desc, err := describe.Describe(h.Target(), h.Target().File(src.Source)) if err != nil { - spool.Warn("%v\n", err) + _, _ = spool.Warn("%v\n", err) return "" } return desc } - -var WrongTargetError = errors.New("wrong target type") - -func (s *shell) Hydrate(target model.Target) (model.HydratedTarget, error) { - cast, ok := target.(*Target) - if !ok { - return nil, WrongTargetError - } - hyd := &Hydrated{BaseHydration: runner.Hydrated(cast)} - return hyd, nil -} diff --git a/runner/shell/target.go b/runner/shell/target.go index 49f7a18..d1262af 100644 --- a/runner/shell/target.go +++ b/runner/shell/target.go @@ -21,7 +21,9 @@ func (s *Target) String() string { } func (s *Target) Hydrate(_ *model.Source) (model.HydratedTarget, error) { - return Runner.Hydrate(s) + return &Hydrated{ + BaseHydration: runner.Hydrated(s), + }, nil } func (s *Target) Sub() []string { |