golinter fixes

go.mod

@@ -14,6 +14,7 @@ require (
 	github.com/blevesearch/bleve/v2 v2.4.0
 	github.com/blevesearch/bleve_index_api v1.1.6
 	github.com/drewlanenga/govector v0.0.0-20220726163947-b958ac08bc93
+	github.com/fsnotify/fsnotify v1.7.0
 	github.com/gliderlabs/ssh v0.3.7
 	github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
 	github.com/go-sql-driver/mysql v1.8.1
@@ -74,7 +75,6 @@ require (
 	github.com/blevesearch/zapx/v15 v15.3.13 // indirect
 	github.com/blevesearch/zapx/v16 v16.0.12 // indirect
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect

runner/runner.go

@@ -13,13 +13,13 @@ import (
 	"sort"
 	"strings"
 
+	"golang.org/x/term"
+
 	"github.com/refaktor/rye/contrib"
-	"github.com/refaktor/rye/current"
 	"github.com/refaktor/rye/env"
 	"github.com/refaktor/rye/evaldo"
 	"github.com/refaktor/rye/loader"
 	"github.com/refaktor/rye/util"
-	"golang.org/x/term"
 )
 
 var (
@@ -187,7 +187,6 @@ func main_ryk() {
 	es := env.NewProgramState(block.(env.Block).Series, genv)
 	evaldo.RegisterBuiltins(es)
 	contrib.RegisterBuiltins(es, &evaldo.BuiltinNames)
-	current.RegisterBuiltins(es)
 	evaldo.EvalBlock(es)
 
 	if len(os.Args) >= 4 {
@@ -438,7 +437,6 @@ func main_rye_file_OLD(file string, sig bool, subc bool, interactive bool, code
 		es := env.NewProgramState(block.(env.Block).Series, genv)
 		evaldo.RegisterBuiltins(es)
 		contrib.RegisterBuiltins(es, &evaldo.BuiltinNames)
-		current.RegisterBuiltins(es)
 
 		if subc {
 			ctx := es.Ctx
@@ -467,7 +465,6 @@ func main_cgi_file(file string, sig bool) {
 		es := env.NewProgramState(block.(env.Block).Series, genv)
 		evaldo.RegisterBuiltins(es)
 		contrib.RegisterBuiltins(es, &evaldo.BuiltinNames)
-		current.RegisterBuiltins(es)
 
 		evaldo.EvalBlock(es)
 		env.SetValue(es, "w", *env.NewNative(es.Idx, w, "Go-server-response-writer"))
@@ -486,7 +483,6 @@ func main_cgi_file(file string, sig bool) {
 			es = env.AddToProgramState(es, block.(env.Block).Series, genv)
 			evaldo.RegisterBuiltins(es)
 			contrib.RegisterBuiltins(es, &evaldo.BuiltinNames)
-			current.RegisterBuiltins(es)
 
 			evaldo.EvalBlock(es)
 			evaldo.MaybeDisplayFailureOrError(es, genv)