diff --git a/tools/updater/precursorupdater.egg-info/entry_points.txt b/tools/updater/precursorupdater.egg-info/entry_points.txt index 8eaa3a73e..8d9b0ffb0 100644 --- a/tools/updater/precursorupdater.egg-info/entry_points.txt +++ b/tools/updater/precursorupdater.egg-info/entry_points.txt @@ -1,2 +1,4 @@ -[console_scripts] -precursorupdater = precursorupdater:main + + [console_scripts] + precursorupdater=precursorupdater:main + \ No newline at end of file diff --git a/tools/updater/precursorupdater/__init__.py b/tools/updater/precursorupdater/__init__.py index e69de29bb..b4c39a3e4 100644 --- a/tools/updater/precursorupdater/__init__.py +++ b/tools/updater/precursorupdater/__init__.py @@ -0,0 +1 @@ +from .precursorupdater import main diff --git a/tools/updater/precursorupdater/precursorupdater.py b/tools/updater/precursorupdater/precursorupdater.py index bbe36747b..30e86df2b 100755 --- a/tools/updater/precursorupdater/precursorupdater.py +++ b/tools/updater/precursorupdater/precursorupdater.py @@ -4,10 +4,13 @@ import argparse import usb.core import usb.util from datetime import datetime +from progressbar.bar import ProgressBar import requests -from precursorusb.precursorusb import PrecursorUsb -from progressbar.bar import ProgressBar +try: + from .precursorusb import PrecursorUsb +except ImportError: + from precursorusb import PrecursorUsb QR_CODE = """ diff --git a/tools/updater/precursorupdater/precursorusb/__init__.py b/tools/updater/precursorupdater/precursorusb/__init__.py index e69de29bb..64f29ce64 100644 --- a/tools/updater/precursorupdater/precursorusb/__init__.py +++ b/tools/updater/precursorupdater/precursorusb/__init__.py @@ -0,0 +1 @@ +from .precursorusb import PrecursorUsb diff --git a/tools/updater/setup.py b/tools/updater/setup.py index 19db1ad11..2e8ea7125 100644 --- a/tools/updater/setup.py +++ b/tools/updater/setup.py @@ -28,7 +28,7 @@ setup( "Topic :: System :: Hardware", "Topic :: System :: Hardware :: Universal Serial Bus (USB)", ], - packages=["precursorupdater"], + packages=find_packages(), install_requires=[ "requests >= 2", "pyusb >= 1",