Merge a2eba8d4ca into 206809a99a

app/data/scrcpy-noconsole.vbs

@@ -1,7 +1,25 @@
 strCommand = "cmd /c scrcpy.exe"
-
-For Each Arg In WScript.Arguments
-    strCommand = strCommand & " """ & replace(Arg, """", """""""""") & """"
-Next
-
-CreateObject("Wscript.Shell").Run strCommand, 0, false
+Dim oShell,exeRs
+Set oShell = CreateObject("WSCript.shell")
+commandLine = "adb.exe devices"
+Set exeRs = oShell.Exec(commandLine) 
+outs = exeRs.StdOut.ReadAll()
+strs= Split(outs,VbCrLf)
+Dim dev
+for i=1 to ubound(strs) 
+	dev = Replace(strs(i), "device", "") 
+	dev = Replace(dev, " ", "") 
+	dev = Trim(dev) 
+	If (Len(dev)) then
+		v=MsgBox("scrcpy -s "&dev&"?",1)
+		If ( v =1 ) then	
+			strCommand = strCommand & " -s " & dev
+			For Each Arg In WScript.Arguments
+				strCommand = strCommand  & " """ & replace(Arg, """", """""""""") & """"
+			Next
+			CreateObject("Wscript.Shell").Run strCommand, 0, false
+		End If
+	End If
+next
+Set oShell = Nothing
+Set exeRs = Nothing