Add .exe to tool ending

Author: tsterbak

openandroidinstaller/openandroidinstaller.py

@@ -56,7 +56,7 @@
 from widgets import call_button, confirm_button, get_title, link_button
 
 # Toggle to True for development purposes
-DEVELOPMENT = True
+DEVELOPMENT = False 
 DEVELOPMENT_CONFIG = "yuga"  # "a3y17lte"  # "sargo"
 
 

openandroidinstaller/tool_utils.py

@@ -13,6 +13,7 @@
 # If not, see <https://www.gnu.org/licenses/>."""
 # Author: Tobias Sterbak
 
+import sys
 from pathlib import Path
 from subprocess import STDOUT, CalledProcessError, call, check_output
 from typing import Optional
@@ -21,11 +22,19 @@
 from loguru import logger
 
 
+PLATFORM = sys.platform
+
+
 def call_tool_with_command(command: str, bin_path: Path) -> bool:
     """Call an executable with a specific command."""
-    command = re.sub(r"^adb", re.escape(str(bin_path.joinpath(Path("adb")))), command)
-    command = re.sub(r"^fastboot", re.escape(str(bin_path.joinpath(Path("fastboot")))), command)
-    command = re.sub(r"^heimdall", re.escape(str(bin_path.joinpath(Path("heimdall")))), command)
+    if PLATFORM == "win32":
+        command = re.sub(r"^adb", re.escape(str(bin_path.joinpath(Path("adb.exe")))), command)
+        command = re.sub(r"^fastboot", re.escape(str(bin_path.joinpath(Path("fastboot.exe")))), command)
+        command = re.sub(r"^heimdall", re.escape(str(bin_path.joinpath(Path("heimdall.exe")))), command)
+    else:
+        command = re.sub(r"^adb", re.escape(str(bin_path.joinpath(Path("adb")))), command)
+        command = re.sub(r"^fastboot", re.escape(str(bin_path.joinpath(Path("fastboot")))), command)
+        command = re.sub(r"^heimdall", re.escape(str(bin_path.joinpath(Path("heimdall")))), command)
 
     logger.info(f"Run command: {command}")
     res = call(f"{command}", shell=True)