Changeset 184 for trunk/Core.pas

Timestamp:

Jan 14, 2025, 11:19:27 AM (10 days ago)

Author:

chronos

Message:

• Fixed: Data directories detection on Linux.

File:

• trunk/Core.pas (modified) (3 diffs)

trunk/Core.pas

@@ -38 +38 @@
     procedure TargetMessageExecute(Text: string);
   public
-    DataDir: string;
+    BaseDir: string;
+    ExamplesDir: string;
     Project: TProject;
     Targets: TTargets;
@@ -65 +66 @@
   Core: TCore;
 
+const
+  ExamplesDirName = 'Examples';
+  LanguagesDirName = 'Languages';
+
 
 implementation
@@ -94 +99 @@
 {$IFDEF UNIX}
 const
-  LinuxDataDir = '/usr/share/LazFuck';
-  LinuxLanguagesDir = LinuxDataDir + '/Languages';
+  LinuxDataDir = '../share/LazFuck';
+var
+  NewDir: string;
 {$ENDIF}
 begin
-  DataDir := '';
+  BaseDir := ExcludeTrailingPathDelimiter(ExtractFilePath(ParamStr(0)));
+  Translator.POFilesFolder := BaseDir + DirectorySeparator + LanguagesDirName;
+  ExamplesDir := BaseDir + DirectorySeparator + ExamplesDirName;
+
   {$IFDEF UNIX}
-  // If installed in Linux system then use installation shared game directory for data files
-  if DirectoryExists(LinuxDataDir) then
-    DataDir := LinuxDataDir
-    else DataDir := GetCurrentDir;
   // If installed in Linux system then use installation directory for po files
-  if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
-    Translator.POFilesFolder := LinuxLanguagesDir;
+  NewDir := ExpandFileName(BaseDir + DirectorySeparator + LinuxDataDir +
+    DirectorySeparator + LanguagesDirName);
+  if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(NewDir) then
+    Translator.POFilesFolder := NewDir;
+
+  // If installed in Linux system then use installation directory for po files
+  NewDir := ExpandFileName(BaseDir + DirectorySeparator + LinuxDataDir +
+    DirectorySeparator + ExamplesDirName);
+  if not DirectoryExists(ExamplesDir) and DirectoryExists(NewDir) then
+    ExamplesDir := NewDir;
   {$ENDIF}