gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-18 12:00:24 +01:00
Code Issues Projects Releases Wiki Activity

Get rid of daemon path from config.

Browse Source 
Also, README update.
This commit is contained in:
gryf
2020-09-01 08:52:41 +02:00
parent 0507d514e8
commit 7dff031ff6
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
README.rst
View File

@@ -27,23 +27,26 @@ Why are you doing this?
My motivation is to make it usable again, and my effort concentrate on the My motivation is to make it usable again, and my effort concentrate on the
daemon itself and curses TUI, as the most attractive parts of the project to me. daemon itself and curses TUI, as the most attractive parts of the project to me.
What's works: What's done:
1. Installation. It was broken, but the fix was trivial. So now, the usual 1. Installation. It was broken, and was fixed. So now, the usual
``python setup.py install`` should just work. ``python setup.py install`` should just work.
2. TUI in ncurses. Actually, it's using `urwid`_ underneath. It still have some 2. TUI in ncurses. Actually, it's using `urwid`_ underneath. It still have some
issue, like crashing in some situations, just like wicd-1.7.4, but I have a issues, like crashing in certain situations, just like wicd-1.7.4.
plan to take a close look at it. 3. Straight up installation process. Separation for runtime/build only paths
and options. Use configuration instead of templated ``wpath.py`` module.
What is not: What is not:
1. GUI/client in GTK. WICD used to use `pygtk`_, which (unfortunately) is 1. GUI. Graphics interface was built using `pygtk`_, which is Python 2, and
Python 2 only project. I would be tempted to reimplement it with gobject, dead project.
but I have 0 motivation for doing so, because GTK2 is not supported through 2. Applet for GNOME Shell. There was simple dispatcher for tray icon for the
it. GUI client in GNOME Shell, so since GUI client is unsupported in Python 3, I
2. Applet for GNOME Shell. There was simple dispatcher for try icon used in have to dro pit aswell.
GNOME Shell, yet, it just use GUI. 3. Notifications. `Notification library`_ was used for GTK client, and is
3. Notification - it was used for GTK client. Python2 only.
4. `python-iwscan`_ and `python-wpactrl`_ are not supported, as they are
considered as dead projects.
License License
@@ -58,3 +61,6 @@ the license attached as a ``LICENSE`` file in the root directory of the project.
.. _been merged: https://github.com/zeph/wicd .. _been merged: https://github.com/zeph/wicd
.. _urwid: http://urwid.org/ .. _urwid: http://urwid.org/
.. _pygtk: https://web.archive.org/web/20180416083422/http://www.pygtk.org .. _pygtk: https://web.archive.org/web/20180416083422/http://www.pygtk.org
.. _Notification library: http://www.galago-project.org
.. _python-iwscan: https://web.archive.org/web/20080926094621/http://projects.otaku42.de/browser/python-iwscan
.. _python-wpactrl: https://web.archive.org/web/20100508185722/http://projects.otaku42.de/wiki/PythonWpaCtrl

1
wicd/config.py
View File

@@ -3,7 +3,6 @@ import os
DEFAULTS = {'bin': '/usr/bin', DEFAULTS = {'bin': '/usr/bin',
'daemon': '/usr/share/wicd/daemon',
'encryption': '/etc/wicd/encryption-templates', 'encryption': '/etc/wicd/encryption-templates',
'etc': '/etc/wicd', 'etc': '/etc/wicd',
'log': '/var/log/wicd', 'log': '/var/log/wicd',

3
wicd/wicd_daemon.py
View File

@@ -1934,7 +1934,8 @@ def run(argv):
child_pid = None child_pid = None
if not no_poll: if not no_poll:
child_pid = Popen([CFG.python, "-O", child_pid = Popen([CFG.python, "-O",
os.path.join(CFG.daemon, "monitor.py")], os.path.join(os.path.dirname(__file__),
"monitor.py")],
shell=False, close_fds=True).pid shell=False, close_fds=True).pid
atexit.register(on_exit, child_pid) atexit.register(on_exit, child_pid)