RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dist: don't install files in /etc from setup.py

This commit is contained in:
Peter F. Patel-Schneider 2020-06-04 15:24:02 -04:00
parent a2ac8b46c1
commit e4d3f5e61e
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/installation.md
View File

@ -44,7 +44,7 @@ for Unity in Ubuntu).
### Installing Solaar's udev Rule ### Installing Solaar's udev Rule
Solaar needs to write to the receiver's HID device. Solaar needs to write to the receiver's HID device.
To be able to do this without running as root requires udev rule To be able to do this without running as root requires a udev rule
that gives seated users write access to the HID devices for Logitech receivers. that gives seated users write access to the HID devices for Logitech receivers.
You can install this rule by copying, as root, You can install this rule by copying, as root,
@ -84,23 +84,25 @@ because this runs arbitrary code as root and because this can override existing
that other users or even the system depend on. If you want to install solaar to /usr/local run that other users or even the system depend on. If you want to install solaar to /usr/local run
`sudo bash -c 'umask 022 ; pip install .'` in the solaar directory. `sudo bash -c 'umask 022 ; pip install .'` in the solaar directory.
(The umask is needed so that the created files and directories can be read and executed by everyone.) (The umask is needed so that the created files and directories can be read and executed by everyone.)
This will also install the udev rule and the Solaar autostart desktop file.
Then solaar can be run as /usr/local/bin/solaar. Then solaar can be run as /usr/local/bin/solaar.
This will not install the udev rule.
[pip]: https://en.wikipedia.org/wiki/Pip_(package_manager) [pip]: https://en.wikipedia.org/wiki/Pip_(package_manager)
## Running Solaar at Startup ## Running Solaar at Startup
Solaar is run automatically at user login via the desktop file Distributions can cause Solaar can be run automatically at user login by installing a desktop file at
`/etc/xdg/autostart/solaar.desktop`. `/etc/xdg/autostart/solaar.desktop`.
If you install Solaar yourself you may need to create or modify this file. If you install Solaar yourself you may need to create or modify this file or install a startup file under your home directory.
## Using PyPI ## Using PyPI
As an alternative to downloading and installing you can install the most recent release As an alternative to downloading and installing you can install the most recent release
(but not the current github version) of Solaar from PyPI. (but not the current github version) of Solaar from PyPI.
Just run `pip install --user solaar` or `sudo pip install solaar`. Just run `pip install --user solaar`.
The `--user` flag will not install the Solaar udev rule or the Solaar autostart file. This will not install the Solaar udev rule, which you will need to copy from
`~/.local/share/solaar/udev-rules.d/42-logitech-unify-permissions.rules`
to `/etc/udev/rules.d`.

5
setup.py
View File

@ -7,8 +7,6 @@ try:
except ImportError: except ImportError:
from distutils.core import setup from distutils.core import setup
autostart_path = '/etc/xdg/autostart'
# from solaar import NAME, __version__ # from solaar import NAME, __version__
__version__ = '1.0.2' __version__ = '1.0.2'
NAME = 'Solaar' NAME = 'Solaar'
@ -25,8 +23,7 @@ def _data_files():
yield _dirname(mo), [mo] yield _dirname(mo), [mo]
yield 'share/applications', ['share/applications/solaar.desktop'] yield 'share/applications', ['share/applications/solaar.desktop']
yield autostart_path, ['share/autostart/solaar.desktop'] yield 'share/solaar/udev-rules.d', ['rules.d/42-logitech-unify-permissions.rules']
yield '/etc/udev/rules.d', ['rules.d/42-logitech-unify-permissions.rules']
del _dirname del _dirname