Better finding the plugin

sarimoly · Sep 22, 2019 · 5f7ec9f · 5f7ec9f
1 parent 550ec5f
commit 5f7ec9f
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/plugin.go b/plugin.go
@@ -53,10 +53,16 @@ func killPlugin() {
 	}
 }
 
-func execPlugin(plugin, pluginOpts, remoteHost, remotePort, localHost, localPort string) error {
+func execPlugin(plugin, pluginOpts, remoteHost, remotePort, localHost, localPort string) (err error) {
+	pluginFile := plugin
 	if fileExists(plugin) {
 		if !filepath.IsAbs(plugin) {
-			plugin = "./" + plugin
+			pluginFile = "./" + plugin
+		}
+	} else {
+		pluginFile, err = exec.LookPath(plugin)
+		if err != nil {
+			return err
 		}
 	}
 	logH := newLogHelper("[" + plugin + "]: ")
@@ -68,13 +74,12 @@ func execPlugin(plugin, pluginOpts, remoteHost, remotePort, localHost, localPort
 		"SS_PLUGIN_OPTIONS="+pluginOpts,
 	)
 	cmd := &exec.Cmd{
-		Path:   plugin,
-		Args:   []string{plugin},
+		Path:   pluginFile,
 		Env:    env,
 		Stdout: logH,
 		Stderr: logH,
 	}
-	if err := cmd.Start(); err != nil {
+	if err = cmd.Start(); err != nil {
 		return err
 	}
 	pluginCmd = cmd