Removing references to legacy GUI.

tarehart · tarehart · commit d8b381575add · 2020-07-12T15:13:48.000-07:00
diff --git a/run-gui.bat b/run-gui.bat
diff --git a/run.bat b/run.bat
@@ -6,26 +6,6 @@ cd /D "%~dp0"
 @rem Make sure the environment variables are up-to-date. This is useful if the user installed python a moment ago.
 call ./RefreshEnv.cmd
 
-setlocal EnableDelayedExpansion
-
-@rem Run the is_safe_to_upgrade function and save the output to a temp file.
-python -c "from rlbot.utils import public_utils; print(public_utils.is_safe_to_upgrade());" > %temp%\is_safe_to_upgrade.txt
-
-IF %ERRORLEVEL% NEQ 0 (
-    @rem The python command failed, so rlbot is probably not installed at all. Safe to 'upgrade'.
-    set is_safe_to_upgrade=True
-) ELSE (
-    @rem read the file containing the python output.
-    set /p is_safe_to_upgrade= < %temp%\is_safe_to_upgrade.txt
-)
-del %temp%\is_safe_to_upgrade.txt
-
-IF "!is_safe_to_upgrade!"=="True" (
-    python -m pip install -r requirements.txt --upgrade
-) ELSE (
-    echo Will not attempt to upgrade rlbot because files are in use.
-)
-
-python -c "from rlbot import runner; runner.main();"
+python run.py
 
 pause
diff --git a/run.py b/run.py
@@ -0,0 +1,33 @@
+import subprocess
+import sys
+
+DEFAULT_LOGGER = 'rlbot'
+
+if __name__ == '__main__':
+
+    try:
+        from rlbot.utils import public_utils, logging_utils
+
+        logger = logging_utils.get_logger(DEFAULT_LOGGER)
+        if not public_utils.have_internet():
+            logger.log(logging_utils.logging_level,
+                       'Skipping upgrade check for now since it looks like you have no internet')
+        elif public_utils.is_safe_to_upgrade():
+            subprocess.call([sys.executable, "-m", "pip", "install", '-r', 'requirements.txt'])
+            subprocess.call([sys.executable, "-m", "pip", "install", 'rlbot', '--upgrade'])
+
+            # https://stackoverflow.com/a/44401013
+            rlbots = [module for module in sys.modules if module.startswith('rlbot')]
+            for rlbot_module in rlbots:
+                sys.modules.pop(rlbot_module)
+
+    except ImportError:
+        subprocess.call([sys.executable, "-m", "pip", "install", '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])
+
+    try:
+        from rlbot import runner
+        runner.main()
+    except Exception as e:
+        print("Encountered exception: ", e)
+        print("Press enter to close.")
+        input()
