diff --git a/README.md b/README.md index a19a372..c2fe83c 100644 --- a/README.md +++ b/README.md @@ -5,15 +5,13 @@ A small background tool to remind the user of the "20-20-20" rule. Uses system n First, you might need these packages: ``` sudo apt-get install python-gobject libnotify-bin python-gst-1.0 - -pip3 install notify2 playsound --user ``` -Second, just install the required [Python modules](src/branch/master/setup.py) via: +Second, just install the tool and required [Python modules](src/branch/master/setup.py) via: ``` python setup.py install --user ``` Or to remove: ``` -pip remove eyestrainreminder +pip uninstall eyestrainreminder ``` \ No newline at end of file diff --git a/eyestrainreminder/__init__.py b/eyestrainreminder/__init__.py index c313e3a..9833a09 100644 --- a/eyestrainreminder/__init__.py +++ b/eyestrainreminder/__init__.py @@ -1 +1 @@ -from .main import * \ No newline at end of file +from .__main__ import * \ No newline at end of file diff --git a/eyestrainreminder/main.py b/eyestrainreminder/__main__.py similarity index 100% rename from eyestrainreminder/main.py rename to eyestrainreminder/__main__.py diff --git a/files/default.wav b/eyestrainreminder/files/default.wav similarity index 100% rename from files/default.wav rename to eyestrainreminder/files/default.wav diff --git a/files/eye_dark.png b/eyestrainreminder/files/eye_dark.png similarity index 100% rename from files/eye_dark.png rename to eyestrainreminder/files/eye_dark.png diff --git a/files/eye_light.png b/eyestrainreminder/files/eye_light.png similarity index 100% rename from files/eye_light.png rename to eyestrainreminder/files/eye_light.png diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 120ce4c..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -notify2>=0.3.1 -playsound>=1.2.2 \ No newline at end of file diff --git a/setup.py b/setup.py index 4efd880..4bf425c 100755 --- a/setup.py +++ b/setup.py @@ -9,9 +9,13 @@ setup(name='EyeStrainReminder', author_email='abhorrentanger@cock.li', url='https://git.pube.tk/abhorrent_anger/EyeStrainReminder', packages=['eyestrainreminder'], + install_requires=[ + 'notify2', + 'playsound' + ], entry_points = { 'console_scripts': [ - 'eyestrainreminder = eyestrainreminder.main:main' + 'eyestrainreminder = eyestrainreminder:main' ] }, ) \ No newline at end of file