From 5c6c123daaf983c3f049c3de5269315afeaaf479 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 22 Oct 2022 20:35:05 -0700
Subject: [PATCH] Fix SDIO launcher when SDIO_SERVER not defined

---
 scripts/launch_sdio.py | 23 ++++++++++++++---------
 scripts/wk/cfg/net.py  | 10 +++++-----
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/scripts/launch_sdio.py b/scripts/launch_sdio.py
index e650ece8..70e6515b 100644
--- a/scripts/launch_sdio.py
+++ b/scripts/launch_sdio.py
@@ -7,7 +7,7 @@ import sys
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
 sys.path.append(os.getcwd())
 import wk # pylint: disable=wrong-import-position
-from wk.cfg.net import SDIO_SERVER
+from wk.cfg.net import SDIO_SERVER # pylint: disable=wrong-import-position
 
 # STATIC VARIABLES
 MOUNT_EXCEPTIONS = (
@@ -35,11 +35,16 @@ def try_again():
 
 def use_network_sdio():
   """Try to mount SDIO server."""
+  use_network = False
   def _mount_server():
     print('Connecting to server...  (Press CTRL+c to use local copy)')
     return wk.net.mount_network_share(SDIO_SERVER, read_write=False)
 
-  use_network = False
+  # Bail early
+  if not SDIO_SERVER['Address']:
+    return use_network
+
+  # Main loop
   while True:
     try:
       proc = _mount_server()
@@ -67,20 +72,20 @@ def use_network_sdio():
 if __name__ == '__main__':
   wk.std.set_title(f'{wk.cfg.main.KIT_NAME_FULL}: Snappy Driver Installer Origin Launcher')
   log_dir = wk.log.format_log_path(tool=True).parent
-  use_network = False
+  USE_NETWORK = False
 
   # Try to mount server
   try:
-    use_network = use_network_sdio()
+    USE_NETWORK = use_network_sdio()
   except KeyboardInterrupt:
     wk.std.abort()
 
   # Run SDIO
-  exe_path = SDIO_LOCAL_PATH
-  if use_network:
-    exe_path = SDIO_REMOTE_PATH
+  EXE_PATH = SDIO_LOCAL_PATH
+  if USE_NETWORK:
+    EXE_PATH = SDIO_REMOTE_PATH
     print('Using network copy!')
   else:
     print('Using local copy!')
-  cmd = [exe_path, '-log_dir', log_dir]
-  wk.exe.run_program(cmd, check=False, cwd=exe_path.parent)
+  cmd = [EXE_PATH, '-log_dir', log_dir]
+  wk.exe.run_program(cmd, check=False, cwd=EXE_PATH.parent)
diff --git a/scripts/wk/cfg/net.py b/scripts/wk/cfg/net.py
index 71fd5241..3771284a 100644
--- a/scripts/wk/cfg/net.py
+++ b/scripts/wk/cfg/net.py
@@ -29,11 +29,11 @@ CRASH_SERVER = {
   #'Headers':    {'X-Requested-With': 'XMLHttpRequest'},
   }
 SDIO_SERVER = {
-  #'Address':  '10.0.0.10',
-  #'Share':    'Share',
-  #'Path':     'SDIO',
-  #'RO-User':  '',
-  #'RO-Pass':  '',
+  'Address':  '',
+  'Share':    '',
+  'Path':     '',
+  'RO-User':  '',
+  'RO-Pass':  '',
   }