From 099d49d67096240fd365dbe8e17a194a638a2868 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Fri, 20 Dec 2024 12:00:23 -0500
Subject: [PATCH] maybe was over complicating things.

---
 setup.py | 76 ++++++++------------------------------------------------
 1 file changed, 10 insertions(+), 66 deletions(-)

diff --git a/setup.py b/setup.py
index f15c0687..8db6e5e0 100755
--- a/setup.py
+++ b/setup.py
@@ -1,102 +1,46 @@
 #!/usr/bin/env python3
 import os
-import sys
 import glob
-from shutil import copyfile
 from setuptools import setup
 
 def get_data_files():
     data_files = []
-    force_settings = os.environ.get('FENRIR_FORCE_SETTINGS') == '1'
     
-    print("DEBUG: Current working directory:", os.getcwd())
-    
-    # Handle locale files
-    locale_files = glob.glob('locale/*/LC_MESSAGES/*.mo')
-    print("DEBUG: Found locale files:", locale_files)
-    for locale_file in locale_files:
-        lang = locale_file.split(os.sep)[1]
-        dest_dir = f'/usr/share/locale/{lang}/LC_MESSAGES'
-        data_files.append((dest_dir, [locale_file]))
-
     # Handle configuration files
     directories = glob.glob('config/*')
-    print("DEBUG: Found config directories:", directories)
     for directory in directories:
         files = glob.glob(directory+'/*')
-        print(f"DEBUG: Found files in {directory}:", files)
         dest_dir = ''
         if 'config/punctuation' in directory:
-            dest_dir = '/etc/fenrirscreenreader/punctuation'
+            dest_dir = 'etc/fenrirscreenreader/punctuation'
         elif 'config/keyboard' in directory:
-            dest_dir = '/etc/fenrirscreenreader/keyboard'
+            dest_dir = 'etc/fenrirscreenreader/keyboard'
         elif 'config/settings' in directory:
-            dest_dir = '/etc/fenrirscreenreader/settings'
-            if not force_settings:
-                try:
-                    files.remove('config/settings/settings.conf')
-                except ValueError:
-                    pass
+            dest_dir = 'etc/fenrirscreenreader/settings'
         elif 'config/scripts' in directory:
-            dest_dir = '/usr/share/fenrirscreenreader/scripts'
-        if dest_dir:
-            print(f"DEBUG: Adding files to {dest_dir}:", files)
+            dest_dir = 'usr/share/fenrirscreenreader/scripts'
+        if dest_dir and files:
             data_files.append((dest_dir, files))
 
     # Handle sound files
     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/*')
-    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
     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
     if os.path.exists('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}")
+        data_files.append(('usr/share/man/man1', ['docs/fenrir.1']))
 
     return data_files
 
 if __name__ == "__main__":
-    setup(
-        data_files=get_data_files(),
-    )
-    
-    force_settings = os.environ.get('FENRIR_FORCE_SETTINGS') == '1'
-    if not force_settings:
-        print('')
-        if not os.path.isfile('/etc/fenrirscreenreader/settings/settings.conf'):
-            try:
-                copyfile('/etc/fenrirscreenreader/settings/settings.conf.example',
-                        '/etc/fenrirscreenreader/settings/settings.conf')
-                print('create settings file in /etc/fenrirscreenreader/settings/settings.conf')
-            except Exception as e:
-                print("DEBUG: Error copying settings file:", e)
-                pass
-        else:
-            print('settings.conf file found. It is not overwritten automatically')
-
-    print('')
-    print('To have Fenrir start at boot:')
-    print('sudo systemctl enable fenrir')
-    print('Pulseaudio users may want to run:')
-    print('/usr/share/fenrirscreenreader/tools/configure_pulse.sh')
-    print('once as their user account and once as root to configure Pulseaudio.')
-    print('Please install the following packages manually:')
-    print('- Speech-dispatcher: for the default speech driver')
-    print('- Espeak: as basic TTS engine')
-    print('- sox: is a player for the generic sound driver')
+    setup(data_files=get_data_files())