sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-25 12:28:14 +08:00
Code Activity

Merge pull request #459 from viperML/master

Browse Source 
Linux compatibility
This commit is contained in:
LmeSzinc
2021-05-31 13:33:18 +08:00
committed by GitHub
parent 55ce818832 dc31a05e0b
commit b6082776f9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/device/connection.py
View File

@@ -14,6 +14,7 @@ class Connection:
r'.\adb\adb.exe', r'.\adb\adb.exe',
r'.\toolkit\Lib\site-packages\adbutils\binaries\adb.exe', r'.\toolkit\Lib\site-packages\adbutils\binaries\adb.exe',
r'.\python\Lib\site-packages\adbutils\binaries\adb.exe', r'.\python\Lib\site-packages\adbutils\binaries\adb.exe',
'/usr/bin/adb'
] ]
def __init__(self, config): def __init__(self, config):
@@ -56,7 +57,10 @@ class Connection:
# Use shell=True to disable console window when using GUI. # Use shell=True to disable console window when using GUI.
# Although, there's still a window when you stop running in GUI, which cause by gooey. # Although, there's still a window when you stop running in GUI, which cause by gooey.
# To disable it, edit gooey/gui/util/taskkill.py # To disable it, edit gooey/gui/util/taskkill.py
process = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) if self.adb_binary == '/usr/bin/adb':
process = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=False)
else:
process = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)
return process.communicate(timeout=10)[0] return process.communicate(timeout=10)[0]
def adb_shell(self, cmd, serial=None): def adb_shell(self, cmd, serial=None):