fix dependency check
This commit is contained in:
		@@ -6,7 +6,7 @@ import os, sys
 | 
				
			|||||||
# speech: speech-dispatcher
 | 
					# speech: speech-dispatcher
 | 
				
			||||||
# sound: sox
 | 
					# sound: sox
 | 
				
			||||||
# braille: brltty:
 | 
					# braille: brltty:
 | 
				
			||||||
defaultInstallation = ['FenrirCore','vcsaDriver','brlapiDriver','evdevDriver','speechdDriver', 'genericDriver']
 | 
					defaultInstallation = ['FenrirCore','vcsaDriver','brlapiDriver','evdevDriver','genericDriver (speech)', 'genericDriver (sound)']
 | 
				
			||||||
currentInstallation = []
 | 
					currentInstallation = []
 | 
				
			||||||
 | 
					
 | 
				
			||||||
print('checking dependencys...')
 | 
					print('checking dependencys...')
 | 
				
			||||||
@@ -32,7 +32,7 @@ if available:
 | 
				
			|||||||
    currentInstallation.append('FenrirCore')
 | 
					    currentInstallation.append('FenrirCore')
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
# SCREEN
 | 
					# SCREEN
 | 
				
			||||||
print('')
 | 
					print('--------------------')
 | 
				
			||||||
print('screen driver')
 | 
					print('screen driver')
 | 
				
			||||||
# VCSA (screen driver)
 | 
					# VCSA (screen driver)
 | 
				
			||||||
print('vcsaDriver')
 | 
					print('vcsaDriver')
 | 
				
			||||||
@@ -50,6 +50,7 @@ else:
 | 
				
			|||||||
    available = available and False    
 | 
					    available = available and False    
 | 
				
			||||||
if available:
 | 
					if available:
 | 
				
			||||||
    currentInstallation.append('vcsaDriver')
 | 
					    currentInstallation.append('vcsaDriver')
 | 
				
			||||||
 | 
					print('')
 | 
				
			||||||
# pty emulation (screen driver)
 | 
					# pty emulation (screen driver)
 | 
				
			||||||
print('ptyDriver')
 | 
					print('ptyDriver')
 | 
				
			||||||
available = True
 | 
					available = True
 | 
				
			||||||
@@ -63,7 +64,7 @@ if available:
 | 
				
			|||||||
    currentInstallation.append('ptyDriver (screen)') 
 | 
					    currentInstallation.append('ptyDriver (screen)') 
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
# BRAILLE
 | 
					# BRAILLE
 | 
				
			||||||
print('')
 | 
					print('--------------------')
 | 
				
			||||||
print('braille driver')
 | 
					print('braille driver')
 | 
				
			||||||
# brltty (braille driver)
 | 
					# brltty (braille driver)
 | 
				
			||||||
print('brlapiDriver')
 | 
					print('brlapiDriver')
 | 
				
			||||||
@@ -78,7 +79,7 @@ except:
 | 
				
			|||||||
if available:
 | 
					if available:
 | 
				
			||||||
    currentInstallation.append('brlapiDriver')
 | 
					    currentInstallation.append('brlapiDriver')
 | 
				
			||||||
# INPUT
 | 
					# INPUT
 | 
				
			||||||
print('')
 | 
					print('--------------------')
 | 
				
			||||||
print('input driver')
 | 
					print('input driver')
 | 
				
			||||||
# evdev (input driver)
 | 
					# evdev (input driver)
 | 
				
			||||||
print('evdevDriver')
 | 
					print('evdevDriver')
 | 
				
			||||||
@@ -99,6 +100,7 @@ except:
 | 
				
			|||||||
if available:
 | 
					if available:
 | 
				
			||||||
    currentInstallation.append('evdevDriver')
 | 
					    currentInstallation.append('evdevDriver')
 | 
				
			||||||
# pty emulation (input driver)
 | 
					# pty emulation (input driver)
 | 
				
			||||||
 | 
					print('')
 | 
				
			||||||
print('ptyDriver')
 | 
					print('ptyDriver')
 | 
				
			||||||
available = True
 | 
					available = True
 | 
				
			||||||
try:
 | 
					try:
 | 
				
			||||||
@@ -110,7 +112,7 @@ except:
 | 
				
			|||||||
if available:
 | 
					if available:
 | 
				
			||||||
    currentInstallation.append('ptyDriver (Input)')     
 | 
					    currentInstallation.append('ptyDriver (Input)')     
 | 
				
			||||||
# SOUND
 | 
					# SOUND
 | 
				
			||||||
print('')
 | 
					print('--------------------')
 | 
				
			||||||
print('sound driver')
 | 
					print('sound driver')
 | 
				
			||||||
print('genericDriver (uses sox by default)')
 | 
					print('genericDriver (uses sox by default)')
 | 
				
			||||||
available = True
 | 
					available = True
 | 
				
			||||||
@@ -120,7 +122,8 @@ else:
 | 
				
			|||||||
    print('sox: FAIL')
 | 
					    print('sox: FAIL')
 | 
				
			||||||
    available = available and False    
 | 
					    available = available and False    
 | 
				
			||||||
if available:
 | 
					if available:
 | 
				
			||||||
    currentInstallation.append('genericDriver')
 | 
					    currentInstallation.append('genericDriver (sound)')
 | 
				
			||||||
 | 
					print('')
 | 
				
			||||||
# gstreamer (sound driver)
 | 
					# gstreamer (sound driver)
 | 
				
			||||||
print('gstreamerDriver')
 | 
					print('gstreamerDriver')
 | 
				
			||||||
available = True
 | 
					available = True
 | 
				
			||||||
@@ -147,7 +150,7 @@ if available:
 | 
				
			|||||||
    currentInstallation.append('gstreamerDriver')
 | 
					    currentInstallation.append('gstreamerDriver')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# SPEECH
 | 
					# SPEECH
 | 
				
			||||||
print('')
 | 
					print('--------------------')
 | 
				
			||||||
print('speech driver')
 | 
					print('speech driver')
 | 
				
			||||||
# speechd (speech driver)
 | 
					# speechd (speech driver)
 | 
				
			||||||
print('speechdDriver')
 | 
					print('speechdDriver')
 | 
				
			||||||
@@ -160,6 +163,7 @@ except:
 | 
				
			|||||||
    available = available and False    
 | 
					    available = available and False    
 | 
				
			||||||
if available:
 | 
					if available:
 | 
				
			||||||
    currentInstallation.append('speechdDriver')
 | 
					    currentInstallation.append('speechdDriver')
 | 
				
			||||||
 | 
					print('')
 | 
				
			||||||
# espeak (speech driver)
 | 
					# espeak (speech driver)
 | 
				
			||||||
print('espeakDriver')
 | 
					print('espeakDriver')
 | 
				
			||||||
available = True
 | 
					available = True
 | 
				
			||||||
@@ -171,9 +175,18 @@ except:
 | 
				
			|||||||
    available = available and False    
 | 
					    available = available and False    
 | 
				
			||||||
if available:
 | 
					if available:
 | 
				
			||||||
    currentInstallation.append('espeakDriver')    
 | 
					    currentInstallation.append('espeakDriver')    
 | 
				
			||||||
 | 
					print('genericDriver (uses espeak by default)')
 | 
				
			||||||
 | 
					available = True
 | 
				
			||||||
 | 
					if os.path.exists('/usr/bin/espeak') or os.path.exists('/bin/espeak'):
 | 
				
			||||||
 | 
					    print('espeak: OK')
 | 
				
			||||||
 | 
					else:
 | 
				
			||||||
 | 
					    print('espeak: FAIL')
 | 
				
			||||||
 | 
					    available = available and False    
 | 
				
			||||||
 | 
					if available:
 | 
				
			||||||
 | 
					    currentInstallation.append('genericDriver (speech)')    
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# SUMMERY
 | 
					# SUMMERY
 | 
				
			||||||
print('')
 | 
					print('====================')
 | 
				
			||||||
available = True
 | 
					available = True
 | 
				
			||||||
missing = []
 | 
					missing = []
 | 
				
			||||||
for element in  defaultInstallation:
 | 
					for element in  defaultInstallation:
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user