Changeset 648 for trunk/Packages/CevoComponents/Directories.pas

Timestamp:

Feb 19, 2025, 9:43:42 AM (3 days ago)

Author:

chronos

Message:

• Fixed: Tribes were not propertly detected in usr/share/c-evo directory.

File:

• trunk/Packages/CevoComponents/Directories.pas (modified) (7 diffs)

trunk/Packages/CevoComponents/Directories.pas

@@ -15 +15 @@
 function GetSoundsDir: string;
 function GetAiDir: string;
-function GetAppShareDir(Dir: string): string;
-function GetAppShareFile(FileName: string): string;
+function GetAppSharePath(Path: string): string;
 
 
@@ -24 +23 @@
   FileUtil, LCLIntf, LCLType, LCLProc, LazUTF8, SysUtils, LazFileUtils, Forms;
 
-function GetAppShareDir(Dir: string): string;
+function GetAppSharePath(Path: string): string;
 {$IFDEF UNIX}
 var
-  NewDir: string;
+  NewPath: string;
 {$ENDIF}
 begin
-  Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Dir;
+  Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Path;
   {$IFDEF UNIX}
   // If installed in Linux system then try to use different installation directory
   if not DirectoryExists(Result) then begin
-    NewDir := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
+    NewPath := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
       DirectorySeparator + 'share' + DirectorySeparator +
-      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Dir;
-    if DirectoryExists(NewDir) then Result := NewDir;
+      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Path;
+    if DirectoryExists(NewPath) then begin
+      Result := NewPath;
+      Exit;
+    end;
   end;
-  {$ENDIF}
-end;
-
-function GetAppShareFile(FileName: string): string;
-{$IFDEF UNIX}
-var
-  NewFile: string;
-{$ENDIF}
-begin
-  Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + FileName;
-  {$IFDEF UNIX}
-  // If installed in Linux system then try to use different installation directory
   if not FileExists(Result) then begin
-    NewFile := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
+    NewPath := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
       DirectorySeparator + 'share' + DirectorySeparator +
-      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + FileName;
-    if FileExists(NewFile) then Result := NewFile;
+      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Path;
+    if FileExists(NewPath) then begin
+      Result := NewPath;
+      Exit;
+    end;
   end;
   {$ENDIF}
@@ -94 +87 @@
 
   if LocaleCode <> 'en' then begin
-    Result := GetAppShareFile('Localization' + DirectorySeparator + LocaleCodeDir + DirectorySeparator + Path);
+    Result := GetAppSharePath('Localization' + DirectorySeparator + LocaleCodeDir + DirectorySeparator + Path);
     if not DirectoryExists(Result) and not FileExists(Result) then
-      Result := GetAppShareFile(Path);
-  end else Result := GetAppShareFile(Path);
+      Result := GetAppSharePath(Path);
+  end else Result := GetAppSharePath(Path);
 end;
 
@@ -131 +124 @@
 
   AppDataDir := GetAppConfigDir(False);
-  if AppDataDir = '' then DataDir := GetAppShareDir('')
+  if AppDataDir = '' then DataDir := GetAppSharePath('')
   else begin
     if not DirectoryExists(AppDataDir) then ForceDirectories(AppDataDir);
@@ -141 +134 @@
 function GetSavedDir(Home: Boolean = False): string;
 begin
-  if Home then Result := GetAppShareDir('Saved')
+  if Home then Result := GetAppSharePath('Saved')
     else Result := DataDir + 'Saved';
 end;
@@ -147 +140 @@
 function GetMapsDir(Home: Boolean = False): string;
 begin
-  if Home then Result := GetAppShareDir('Maps')
+  if Home then Result := GetAppSharePath('Maps')
     else Result := DataDir + 'Maps';
 end;
@@ -153 +146 @@
 function GetGraphicsDir: string;
 begin
-  Result := GetAppShareDir('Graphics');
+  Result := GetAppSharePath('Graphics');
 end;
 
 function GetSoundsDir: string;
 begin
-  Result := GetAppShareDir('Sounds');
+  Result := GetAppSharePath('Sounds');
 end;
 
 function GetAiDir: string;
 begin
-  Result := GetAppShareDir('AI');
+  Result := GetAppSharePath('AI');
 end;