1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 20:38:00 +01:00

Remove extraneous comments from setup.py and clean up a few of them.

This is definitely trivial crap...
This commit is contained in:
Robby Workman
2008-12-14 07:58:58 +00:00
parent f3d9dcaf1e
commit 19691e2b7c

View File

@@ -29,21 +29,9 @@ VERSION_NUM = '1.6.0'
class configure(Command): class configure(Command):
description = "configure the paths that Wicd will be installed to" description = "configure the paths that Wicd will be installed to"
# lib = '/usr/share/wicd/'
# etc = '/etc/wicd/'
# images = '/usr/share/pixmaps/wicd/'
# encryption = etc + 'encryption/templates/'
# bin = current
# networks = '/var/lib/wicd/configurations/'
# log = '/var/log/wicd/'
#
# python = '/usr/bin/python'
user_options = [ user_options = [
# these first bunch are DIRECTORIES. # The first bunch is DIRECTORIES - they need to end with a slash ("/"),
# they need to end a slash ("/") # which will automatically be tacked on in the finalize_options method
# which will automatically be tacked on
# in the finalize_options method
('lib=', None, 'set the lib directory'), ('lib=', None, 'set the lib directory'),
('share=', None, 'set the share directory'), ('share=', None, 'set the share directory'),
('etc=', None, 'set the etc directory'), ('etc=', None, 'set the etc directory'),
@@ -60,7 +48,6 @@ class configure(Command):
('dbus=', None, 'set the directory the dbus config file is stored in'), ('dbus=', None, 'set the directory the dbus config file is stored in'),
('desktop=', None, 'set the directory the .desktop file is stored in'), ('desktop=', None, 'set the directory the .desktop file is stored in'),
('icons=', None, "set the base directory for the .desktop file's icons"), ('icons=', None, "set the base directory for the .desktop file's icons"),
# ('pixmaps=', None, 'directory for images'),
('translations=', None, 'set the directory translations are stored in'), ('translations=', None, 'set the directory translations are stored in'),
('autostart=', None, 'set the directory that will be autostarted on desktop login'), ('autostart=', None, 'set the directory that will be autostarted on desktop login'),
('init=', None, 'set the directory for the init file'), ('init=', None, 'set the directory for the init file'),
@@ -68,17 +55,16 @@ class configure(Command):
('mandir=', None, 'set the directory for the man pages'), ('mandir=', None, 'set the directory for the man pages'),
('kdedir=', None, 'set the kde autostart directory'), ('kdedir=', None, 'set the kde autostart directory'),
# anything after here is a FILE. # Anything after this is a FILE; in other words, a slash ("/") will
# in other words, a slash ("/") will not automatically # not automatically be added to the end of the path.
# be added to the end of the path. # Do NOT remove the python= entry, as it signals the beginning of
# do NOT remove the python= entry as it signals the beginning # the file section.
# of the file section.
('python=', None, 'set the path to the Python executable'), ('python=', None, 'set the path to the Python executable'),
('pidfile=', None, 'set the pid file'), ('pidfile=', None, 'set the pid file'),
('initfile=', None, 'set the init file to use'), ('initfile=', None, 'set the init file to use'),
('initfilename=', None, "set the name of the init file (don't use)"), ('initfilename=', None, "set the name of the init file (don't use)"),
# switches # Configure switches
('no-install-init', None, "do not install the init file"), ('no-install-init', None, "do not install the init file"),
('no-install-man', None, 'do not install the man file'), ('no-install-man', None, 'do not install the man file'),
('no-install-kde', None, 'do not install the kde autostart file'), ('no-install-kde', None, 'do not install the kde autostart file'),
@@ -118,8 +104,7 @@ class configure(Command):
self.no_install_pmutils = False self.no_install_pmutils = False
self.no_install_docs = False self.no_install_docs = False
# figure out what the default init file # Determine the default init file location on several different distros
# location should be on several different distros
self.distro_detect_failed = False self.distro_detect_failed = False
@@ -190,10 +175,12 @@ class configure(Command):
except (OSError, ValueError): except (OSError, ValueError):
pass # use our default pass # use our default
self.python = '/usr/bin/python' self.python = '/usr/bin/python'
self.pidfile = '/var/run/wicd/wicd.pid' self.pidfile = '/var/run/wicd/wicd.pid'
self.initfilename = os.path.basename(self.initfile) self.initfilename = os.path.basename(self.initfile)
def finalize_options(self): def finalize_options(self):
if self.distro_detect_failed == True: if self.distro_detect_failed == True:
if not self.no_install_init: if not self.no_install_init: