X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fsyncthing%2Fst.go;h=1f7875749eddc42952413fe10a722fd8b44bc96a;hb=6f8c05ea93ec52819785d73f0377d35b1073dc3f;hp=a750036f4d863f827c4341653f9362c18838e485;hpb=6dbd164227b88239c3e479f49e6c936dc652085a;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index a750036..1f78757 100644
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -95,9 +95,17 @@ func (s *SyncThing) startProc(exeName string, args []string, env []string, eChan
 		exec.Command("bash", "-c", "pkill -9 "+exeName).Output()
 	}
 
-	path, err := exec.LookPath(path.Join(s.binDir, exeName))
+	// When not set (or set to '.') set bin to path of xds-agent executable
+	bdir := s.binDir
+	if bdir == "" || bdir == "." {
+		if dir, err := filepath.Abs(filepath.Dir(os.Args[0])); err == nil {
+			bdir = dir
+		}
+	}
+
+	path, err := exec.LookPath(path.Join(bdir, exeName))
 	if err != nil {
-		return nil, fmt.Errorf("Cannot find %s executable in %s", exeName, s.binDir)
+		return nil, fmt.Errorf("Cannot find %s executable in %s", exeName, bdir)
 	}
 	cmd := exec.Command(path, args...)
 	cmd.Env = os.Environ()