common-params.go

@@ -15,7 +15,6 @@ const (
 	ParamStart     = "start"
 	ParamEnd       = "end"
 	ParamValue     = "value"
-	ParamName      = "name"
 	ParamEllipsis  = "..."
 	ParamFilepath  = "filepath"
 	ParamDirpath   = "dirpath"

plugins.go

@@ -6,9 +6,7 @@ package expr
 
 import (
 	"fmt"
-	"os"
 	"plugin"
-	"strings"
 )
 
 var pluginRegister map[string]*plugin.Plugin
@@ -27,17 +25,6 @@ func pluginExists(name string) (exists bool) {
 	return
 }
 
-func makePluginName(name string) (decorated string) {
-	var template string
-	if execName, err := os.Executable(); err != nil || !strings.HasSuffix(execName, ".debug") {
-		template = "expr-%s-plugin.so"
-	} else {
-		template = "expr-%s-plugin.so.debug"
-	}
-	decorated = fmt.Sprintf(template, name)
-	return
-}
-
 func importPlugin( /*ctx ExprContext,*/ dirList []string, name string) (err error) {
 	var filePath string
 	var p *plugin.Plugin
@@ -46,7 +33,7 @@ func importPlugin( /*ctx ExprContext,*/ dirList []string, name string) (err erro
 	var importFunc func(ExprContext)
 	var ok bool
 
-	decoratedName := makePluginName(name)
+	decoratedName := fmt.Sprintf("expr-%s-plugin.so", name)
 
 	if filePath, err = makeFilepath(decoratedName, dirList); err != nil {
 		return