fix adb when no adb.exe in path

Teages · May 12, 2023 · 6add61c · 6add61c
1 parent c1497ab
commit 6add61c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/server/internal/adb/adb.go b/server/internal/adb/adb.go
@@ -44,7 +44,8 @@ func Exec(args ...string) {
 func init() {
 	Exec("start-server")
 	a, err := adb.NewWithConfig(adb.ServerConfig{
-		Port: *flag.Int("p", adb.AdbPort, ""),
+		PathToAdb: adbPath,
+		Port:      *flag.Int("p", adb.AdbPort, ""),
 	})
 	if logger.Catch(err) {
 		logger.Error("Can't start ADB server")

diff --git a/server/internal/adb/adb_windows.go b/server/internal/adb/adb_windows.go
@@ -11,6 +11,6 @@ var (
 	adbFiles embed.FS
 	adbPath  = func() string {
 		vfile.JoinPart("libs/adb", "windows", adbFiles)
-		return vfile.GetPath("libs/adb/adb")
+		return vfile.GetPath("libs/adb/adb.exe")
 	}()
 )