mirror of
https://github.com/gryf/wicd.git
synced 2025-12-21 13:28:08 +01:00
Fixed up setup.py and wpath.py to install the curses client.
Added a wicd-curses wrapper script to /usr/bin Made curses *.py files executable All of this passes the build test, but not the "WFM" test. :)
This commit is contained in:
0
curses/curses_misc.py
Normal file → Executable file
0
curses/curses_misc.py
Normal file → Executable file
0
curses/prefs_curses.py
Normal file → Executable file
0
curses/prefs_curses.py
Normal file → Executable file
0
curses/wicd-curses.py
Normal file → Executable file
0
curses/wicd-curses.py
Normal file → Executable file
2
in/scripts=wicd-curses.in
Executable file
2
in/scripts=wicd-curses.in
Executable file
@@ -0,0 +1,2 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
exec python -O %LIB%wicd-curses.py $@
|
||||||
@@ -64,6 +64,7 @@ no_install_man = %NO_INSTALL_MAN%
|
|||||||
no_install_kde = %NO_INSTALL_KDE%
|
no_install_kde = %NO_INSTALL_KDE%
|
||||||
no_install_acpi = %NO_INSTALL_ACPI%
|
no_install_acpi = %NO_INSTALL_ACPI%
|
||||||
no_install_docs = %NO_INSTALL_DOCS%
|
no_install_docs = %NO_INSTALL_DOCS%
|
||||||
|
no_install_ncurses = %NO_INSTALL_NCURSES%
|
||||||
|
|
||||||
def chdir(file):
|
def chdir(file):
|
||||||
"""Change directory to the location of the specified file.
|
"""Change directory to the location of the specified file.
|
||||||
|
|||||||
9
setup.py
9
setup.py
@@ -84,7 +84,8 @@ class configure(Command):
|
|||||||
('no-install-kde', None, 'do not install the kde autostart file'),
|
('no-install-kde', None, 'do not install the kde autostart file'),
|
||||||
('no-install-acpi', None, 'do not install the suspend.d and resume.d acpi scripts'),
|
('no-install-acpi', None, 'do not install the suspend.d and resume.d acpi scripts'),
|
||||||
('no-install-pmutils', None, 'do not install the pm-utils hooks'),
|
('no-install-pmutils', None, 'do not install the pm-utils hooks'),
|
||||||
('no-install-docs', None, 'do not install the auxiliary documentation')
|
('no-install-docs', None, 'do not install the auxiliary documentation'),
|
||||||
|
('no-install-ncurses', None, 'do not install the ncurses client')
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@@ -117,6 +118,7 @@ class configure(Command):
|
|||||||
self.no_install_acpi = False
|
self.no_install_acpi = False
|
||||||
self.no_install_pmutils = False
|
self.no_install_pmutils = False
|
||||||
self.no_install_docs = False
|
self.no_install_docs = False
|
||||||
|
self.no_install_ncurses = False
|
||||||
|
|
||||||
# Determine the default init file location on several different distros
|
# Determine the default init file location on several different distros
|
||||||
|
|
||||||
@@ -392,6 +394,11 @@ try:
|
|||||||
(wpath.backends, ['wicd/backends/be-external.py', 'wicd/backends/be-ioctl.py']),
|
(wpath.backends, ['wicd/backends/be-external.py', 'wicd/backends/be-ioctl.py']),
|
||||||
(wpath.autostart, ['other/wicd-tray.desktop', ]),
|
(wpath.autostart, ['other/wicd-tray.desktop', ]),
|
||||||
]
|
]
|
||||||
|
if not wpath.no_install_ncurses:
|
||||||
|
data.append(( wpath.lib, ['curses/curses_misc.py']))
|
||||||
|
data.append(( wpath.lib, ['curses/prefs_curses.py']))
|
||||||
|
data.append(( wpath.lib, ['curses/wicd-curses.py']))
|
||||||
|
data.append(( wpath.bin, ['scripts/wicd-curses']))
|
||||||
piddir = os.path.dirname(wpath.pidfile)
|
piddir = os.path.dirname(wpath.pidfile)
|
||||||
if not piddir.endswith('/'):
|
if not piddir.endswith('/'):
|
||||||
piddir += '/'
|
piddir += '/'
|
||||||
|
|||||||
Reference in New Issue
Block a user