Trying some debugging to figure out what's going wrong.
This commit is contained in:
parent
191181a6a5
commit
67b6c79678
25
setup.py
25
setup.py
@ -9,17 +9,22 @@ def get_data_files():
|
|||||||
data_files = []
|
data_files = []
|
||||||
force_settings = os.environ.get('FENRIR_FORCE_SETTINGS') == '1'
|
force_settings = os.environ.get('FENRIR_FORCE_SETTINGS') == '1'
|
||||||
|
|
||||||
|
print("DEBUG: Current working directory:", os.getcwd())
|
||||||
|
|
||||||
# Handle locale files
|
# Handle locale files
|
||||||
locale_files = glob.glob('locale/*/LC_MESSAGES/*.mo')
|
locale_files = glob.glob('locale/*/LC_MESSAGES/*.mo')
|
||||||
|
print("DEBUG: Found locale files:", locale_files)
|
||||||
for locale_file in locale_files:
|
for locale_file in locale_files:
|
||||||
lang = locale_file.split(os.sep)[1]
|
lang = locale_file.split(os.sep)[1]
|
||||||
dest_dir = f'/usr/share/locale/{lang}/LC_MESSAGES'
|
dest_dir = f'/usr/share/locale/{lang}/LC_MESSAGES'
|
||||||
data_files.append((dest_dir, [locale_file]))
|
data_files.append((dest_dir, [locale_file]))
|
||||||
|
|
||||||
# Handle configuration files - using original code
|
# Handle configuration files
|
||||||
directories = glob.glob('config/*')
|
directories = glob.glob('config/*')
|
||||||
|
print("DEBUG: Found config directories:", directories)
|
||||||
for directory in directories:
|
for directory in directories:
|
||||||
files = glob.glob(directory+'/*')
|
files = glob.glob(directory+'/*')
|
||||||
|
print(f"DEBUG: Found files in {directory}:", files)
|
||||||
dest_dir = ''
|
dest_dir = ''
|
||||||
if 'config/punctuation' in directory:
|
if 'config/punctuation' in directory:
|
||||||
dest_dir = '/etc/fenrirscreenreader/punctuation'
|
dest_dir = '/etc/fenrirscreenreader/punctuation'
|
||||||
@ -35,21 +40,35 @@ def get_data_files():
|
|||||||
elif 'config/scripts' in directory:
|
elif 'config/scripts' in directory:
|
||||||
dest_dir = '/usr/share/fenrirscreenreader/scripts'
|
dest_dir = '/usr/share/fenrirscreenreader/scripts'
|
||||||
if dest_dir:
|
if dest_dir:
|
||||||
|
print(f"DEBUG: Adding files to {dest_dir}:", files)
|
||||||
data_files.append((dest_dir, files))
|
data_files.append((dest_dir, files))
|
||||||
|
|
||||||
# Handle sound files
|
# Handle sound files
|
||||||
files = glob.glob('config/sound/default/*')
|
files = glob.glob('config/sound/default/*')
|
||||||
|
print("DEBUG: Found default sound files:", files)
|
||||||
|
if files:
|
||||||
data_files.append(('/usr/share/sounds/fenrirscreenreader/default', files))
|
data_files.append(('/usr/share/sounds/fenrirscreenreader/default', files))
|
||||||
|
|
||||||
files = glob.glob('config/sound/template/*')
|
files = glob.glob('config/sound/template/*')
|
||||||
|
print("DEBUG: Found template sound files:", files)
|
||||||
|
if files:
|
||||||
data_files.append(('/usr/share/sounds/fenrirscreenreader/template', files))
|
data_files.append(('/usr/share/sounds/fenrirscreenreader/template', files))
|
||||||
|
|
||||||
# Handle tools directory
|
# Handle tools directory
|
||||||
files = glob.glob('tools/*')
|
files = glob.glob('tools/*')
|
||||||
|
if files:
|
||||||
data_files.append(('/usr/share/fenrirscreenreader/tools', files))
|
data_files.append(('/usr/share/fenrirscreenreader/tools', files))
|
||||||
|
|
||||||
# Add man page
|
# Add man page
|
||||||
|
if os.path.exists('docs/fenrir.1'):
|
||||||
data_files.append(('/usr/share/man/man1', ['docs/fenrir.1']))
|
data_files.append(('/usr/share/man/man1', ['docs/fenrir.1']))
|
||||||
|
|
||||||
|
print("\nDEBUG: Final data_files list:")
|
||||||
|
for dest, files in data_files:
|
||||||
|
print(f" {dest}:")
|
||||||
|
for f in files:
|
||||||
|
print(f" - {f}")
|
||||||
|
|
||||||
return data_files
|
return data_files
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
@ -60,13 +79,13 @@ if __name__ == "__main__":
|
|||||||
force_settings = os.environ.get('FENRIR_FORCE_SETTINGS') == '1'
|
force_settings = os.environ.get('FENRIR_FORCE_SETTINGS') == '1'
|
||||||
if not force_settings:
|
if not force_settings:
|
||||||
print('')
|
print('')
|
||||||
# create settings file from example if not exist
|
|
||||||
if not os.path.isfile('/etc/fenrirscreenreader/settings/settings.conf'):
|
if not os.path.isfile('/etc/fenrirscreenreader/settings/settings.conf'):
|
||||||
try:
|
try:
|
||||||
copyfile('/etc/fenrirscreenreader/settings/settings.conf.example',
|
copyfile('/etc/fenrirscreenreader/settings/settings.conf.example',
|
||||||
'/etc/fenrirscreenreader/settings/settings.conf')
|
'/etc/fenrirscreenreader/settings/settings.conf')
|
||||||
print('create settings file in /etc/fenrirscreenreader/settings/settings.conf')
|
print('create settings file in /etc/fenrirscreenreader/settings/settings.conf')
|
||||||
except:
|
except Exception as e:
|
||||||
|
print("DEBUG: Error copying settings file:", e)
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
print('settings.conf file found. It is not overwritten automatically')
|
print('settings.conf file found. It is not overwritten automatically')
|
||||||
|
Loading…
Reference in New Issue
Block a user