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

Search for the distro using map, instead of if-elif-else chains

Browse Source
This commit is contained in:
gryf
2020-08-25 21:13:10 +02:00
parent 3e4d17122f
commit 48057e6fe0
1 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
setup.py
View File

@@ -43,6 +43,19 @@ except IOError:
REVISION_NUM = 'unknown' REVISION_NUM = 'unknown'
CURSES_REVNO = 'uimod' CURSES_REVNO = 'uimod'
DISTROS = {'/etc/redhat-release': 'redhat',
'/etc/SuSE-release': 'suse',
'/etc/fedora-release': 'redhat',
'/etc/gentoo-release': 'gentoo',
'/etc/debian_version': 'debian',
'/etc/arch-release': 'arch',
'/etc/slackware-version': 'slackware',
'/etc/slamd64-version': 'slackware',
'/etc/bluewhite64-version': 'slackware',
'/etc/pld-release': 'pld',
'/usr/bin/crux': 'crux',
'/etc/lunar.release': 'lunar'}
data = [] data = []
# path to the file to put in empty directories # path to the file to put in empty directories
@@ -70,8 +83,6 @@ class configure(setuptools.Command):
description = "configure the paths that Wicd will be installed to" description = "configure the paths that Wicd will be installed to"
user_options = [ user_options = [
# The first bunch is DIRECTORIES - they need to end with a slash ("/"),
# 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'),
@@ -154,34 +165,13 @@ class configure(setuptools.Command):
# Determine the default init file location on several different distros # Determine the default init file location on several different distros
self.distro_detect_failed = False self.distro_detect_failed = False
self.initfile = 'init/default/wicd' self.detected_distro = 'FAIL'
# ddistro is the detected distro for fname, distro in DISTROS.items():
if os.path.exists('/etc/redhat-release'): if os.path.exists(fname):
self.ddistro = 'redhat' self.detected_distro = distro
elif os.path.exists('/etc/SuSE-release'): break
self.ddistro = 'suse'
elif os.path.exists('/etc/fedora-release'): if self.detected_distro == 'FAIL':
self.ddistro = 'redhat'
elif os.path.exists('/etc/gentoo-release'):
self.ddistro = 'gentoo'
elif os.path.exists('/etc/debian_version'):
self.ddistro = 'debian'
elif os.path.exists('/etc/arch-release'):
self.ddistro = 'arch'
elif (os.path.exists('/etc/slackware-version') or
os.path.exists('/etc/slamd64-version') or
os.path.exists('/etc/bluewhite64-version')):
self.ddistro = 'slackware'
elif os.path.exists('/etc/pld-release'):
self.ddistro = 'pld'
elif os.path.exists('/usr/bin/crux'):
self.ddistro = 'crux'
elif os.path.exists('/etc/lunar.release'):
self.distro = 'lunar'
else:
self.ddistro = 'FAIL'
# self.no_install_init = True
# self.distro_detect_failed = True
log.warn('WARNING: Unable to detect the distribution in use.\nIf ' log.warn('WARNING: Unable to detect the distribution in use.\nIf '
'you have specified --distro or --init and --initfile, ' 'you have specified --distro or --init and --initfile, '
'configure will continue.\nPlease report this warning, ' 'configure will continue.\nPlease report this warning, '