Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions openadbshell.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from threading import Thread, Event


adb_path = "adb\\adb.exe"
adb_path = os.path.join("adb", "adb.exe")


def save_config():
Expand Down Expand Up @@ -161,7 +161,7 @@ def save_and_close():
if not os.path.exists(adb_path):
messagebox.showerror("Error", "Selected ADB executable not "
"found. Resetting to default.")
adb_path_var.set("adb\\adb.exe")
adb_path_var.set(os.path.join("adb", "adb.exe"))
save_config()

# Save devices from the table
Expand Down Expand Up @@ -198,7 +198,7 @@ def clear_all_devices():

def add_device():
"""Add a new empty row to the device table."""
device_tree.insert('', 'end', values=('', '', 'N'))
device_tree.insert('', 'end', values=('EXAMPLE_NAME', 'IP:PORT', 'N'))

def delete_selected_device():
"""Delete the selected device from the table."""
Expand Down Expand Up @@ -248,7 +248,7 @@ def browse_adb():

def reset_adb():
"""Reset the ADB path to the default relative path."""
adb_path_var.set("adb\\adb.exe")
adb_path_var.set(os.path.join("adb", "adb.exe"))

def set_to_path():
"""Set the ADB path to just 'adb' to use the system PATH."""
Expand Down Expand Up @@ -377,7 +377,7 @@ def reset_all():
do_cust_command = True
rich_presence = True
do_mods = False
adb_path = "adb\\adb.exe"
adb_path = os.path.join("adb", "adb.exe")
cust_command_var.set(do_cust_command)
rich_presence_var.set(rich_presence)
do_mods_var.set(do_mods)
Expand Down