Moving the install and upgrade logic into a python script. (#7)

Author: tarehart

requirements.txt

@@ -1,3 +1,6 @@
 # Include everything the framework requires
 # You will automatically get updates for all versions starting with "1.".
 rlbot==1.*
+
+# This will cause pip to auto-upgrade and stop scaring people with warning messages
+pip

run-gui.bat

@@ -6,26 +6,4 @@ 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.gui.qt_root import RLBotQTGui; RLBotQTGui.main();"
-
-pause
+python run.py gui

run.bat

@@ -6,26 +6,4 @@ 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();"
-
-pause
+python run.py

run.py

@@ -0,0 +1,38 @@
+# https://stackoverflow.com/a/51704613
+try:
+    from pip import main as pipmain
+except ImportError:
+    from pip._internal import main as pipmain
+
+
+# https://stackoverflow.com/a/24773951
+def install_and_import(package):
+    import importlib
+
+    try:
+        importlib.import_module(package)
+    except ImportError:
+        pipmain(['install', package])
+    finally:
+        globals()[package] = importlib.import_module(package)
+
+
+if __name__ == '__main__':
+    install_and_import('rlbot')
+    from rlbot.utils import public_utils
+
+    if public_utils.is_safe_to_upgrade():
+        pipmain(['install', '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])
+
+    try:
+        import sys
+        if len(sys.argv) > 1 and sys.argv[1] == 'gui':
+            from rlbot.gui.qt_root import RLBotQTGui
+            RLBotQTGui.main()
+        else:
+            from rlbot import runner
+            runner.main()
+    except Exception as e:
+        print("Encountered exception: ", e)
+        print("Press enter to close.")
+        input()