Changeset 647

Timestamp:

Feb 19, 2025, 9:18:32 AM (3 days ago)

Author:

chronos

Message:

• Modified: Detect data files usr/share/c-evo directory on Linux as relative directory to usr/bin directory.

Location:

trunk

Files:

• Install/appimage/AppRun (modified) (1 diff)
• Install/appimage/build.sh (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/TechTree.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (1 diff)
• Packages/CevoComponents/Directories.pas (modified) (8 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (2 diffs)
• Start.pas (modified) (3 diffs)

trunk/Install/appimage/AppRun

@@ -1 +1 @@
 #!/bin/bash
-exec $APPDIR/usr/share/c-evo/c-evo
+exec $APPDIR/usr/bin/c-evo

trunk/Install/appimage/build.sh

@@ -4 +4 @@
 mv ../../AI/StdAI/libstdai.so ../../AI/StdAI/libstdai-amd64.so
 lazbuild --build-mode=Release ../../Integrated.lpi
-install -Dm755 ../../c-evo -t AppDir/usr/share/c-evo
-install -d AppDir/usr/bin
-ln -s $FLATPAK_DEST/share/c-evo/c-evo AppDir/usr/bin/c-evo
+install -Dm755 ../../c-evo -t AppDir/usr/bin
 install -Dm644 ../../Language.txt -t AppDir/usr/share/c-evo
 install -Dm644 ../../Language2.txt -t AppDir/usr/share/c-evo

trunk/LocalPlayer/Help.pas

@@ -1982 +1982 @@
       if Category = hkInternet then
         case Index of
-          1: OpenDocument(HomeDir + AITemplateFileName);
+          1: OpenDocument(GetAppShareFile(AITemplateFileName));
           2: OpenURL(CevoHomepage);
           3: OpenURL(CevoContact);

trunk/LocalPlayer/TechTree.pas

@@ -176 +176 @@
     Image := TBitmap.Create;
     Image.PixelFormat := TPixelFormat.pf24bit;
-    LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree.png',
+    LoadGraphicFile(Image, GetAppShareFile('Help' + DirectorySeparator + 'AdvTree.png'),
       [gfNoGamma]);
 

trunk/LocalPlayer/Term.pas

@@ -1386 +1386 @@
     if AILogo[P] = nil then
       AILogo[P] := TBitmap.Create;
-    if not LoadGraphicFile(AILogo[P], HomeDir + Name + '.png', [gfNoError]) then
+    if not LoadGraphicFile(AILogo[P], GetAppShareFile(Name + '.png'), [gfNoError]) then
     begin
       FreeAndNil(AILogo[P]);

trunk/Packages/CevoComponents/Directories.pas

@@ -4 +4 @@
 
 var
-  HomeDir: string;
   DataDir: string;
   LocaleCode: string = '';
@@ -16 +15 @@
 function GetSoundsDir: string;
 function GetAiDir: string;
+function GetAppShareDir(Dir: string): string;
+function GetAppShareFile(FileName: string): string;
 
 
@@ -21 +22 @@
 
 uses
-  FileUtil, LCLIntf, LCLType, LCLProc, LazUTF8, SysUtils;
+  FileUtil, LCLIntf, LCLType, LCLProc, LazUTF8, SysUtils, LazFileUtils, Forms;
+
+function GetAppShareDir(Dir: string): string;
+{$IFDEF UNIX}
+var
+  NewDir: string;
+{$ENDIF}
+begin
+  Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Dir;
+  {$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 + '..' +
+      DirectorySeparator + 'share' + DirectorySeparator +
+      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Dir;
+    if DirectoryExists(NewDir) then Result := NewDir;
+  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 + '..' +
+      DirectorySeparator + 'share' + DirectorySeparator +
+      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + FileName;
+    if FileExists(NewFile) then Result := NewFile;
+  end;
+  {$ENDIF}
+end;
 
 function GetLocale: string;
@@ -57 +94 @@
 
   if LocaleCode <> 'en' then begin
-    Result := HomeDir + 'Localization' + DirectorySeparator + LocaleCodeDir + DirectorySeparator + Path;
+    Result := GetAppShareFile('Localization' + DirectorySeparator + LocaleCodeDir + DirectorySeparator + Path);
     if not DirectoryExists(Result) and not FileExists(Result) then
-      Result := HomeDir + Path;
-  end else Result := HomeDir + Path;
+      Result := GetAppShareFile(Path);
+  end else Result := GetAppShareFile(Path);
 end;
 
@@ -92 +129 @@
 begin
   LocaleCode := '';
-  HomeDir := ExtractFilePath(ParamStr(0));
 
   AppDataDir := GetAppConfigDir(False);
-  if AppDataDir = '' then DataDir := HomeDir
+  if AppDataDir = '' then DataDir := GetAppShareDir('')
   else begin
     if not DirectoryExists(AppDataDir) then ForceDirectories(AppDataDir);
@@ -105 +141 @@
 function GetSavedDir(Home: Boolean = False): string;
 begin
-  if Home then Result := HomeDir + 'Saved'
+  if Home then Result := GetAppShareDir('Saved')
     else Result := DataDir + 'Saved';
 end;
@@ -111 +147 @@
 function GetMapsDir(Home: Boolean = False): string;
 begin
-  if Home then Result := HomeDir + 'Maps'
+  if Home then Result := GetAppShareDir('Maps')
     else Result := DataDir + 'Maps';
 end;
@@ -117 +153 @@
 function GetGraphicsDir: string;
 begin
-  Result := HomeDir + 'Graphics';
+  Result := GetAppShareDir('Graphics');
 end;
 
 function GetSoundsDir: string;
 begin
-  Result := HomeDir + 'Sounds';
+  Result := GetAppShareDir('Sounds');
 end;
 
 function GetAiDir: string;
 begin
-  Result := HomeDir + 'AI';
+  Result := GetAppShareDir('AI');
 end;
 

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -1609 +1609 @@
     else
     begin
-      Phrases2.LoadFromFile(HomeDir + 'Language2.txt');
+      Phrases2.LoadFromFile(GetAppShareFile('Language2.txt'));
       Phrases2FallenBackToEnglish := True;
     end;
@@ -1615 +1615 @@
   else
   begin
-    Phrases.LoadFromFile(HomeDir + 'Language.txt');
-    Phrases2.LoadFromFile(HomeDir + 'Language2.txt');
+    Phrases.LoadFromFile(GetAppShareFile('Language.txt'));
+    Phrases2.LoadFromFile(GetAppShareFile('Language2.txt'));
   end;
 

trunk/Start.pas

@@ -235 +235 @@
 
   ActionsOffered := [maConfig, maManual, maCredits, maWeb];
-  if FileExists(HomeDir + AITemplateFileName) then
+  if FileExists(GetAppShareFile(AITemplateFileName)) then
     Include(ActionsOffered, maAIDev);
 
@@ -484 +484 @@
     for I := 1 to Languages.Count - 1 do
     with Languages[I] do begin
-      Available := DirectoryExists(HomeDir + 'Localization' + DirectorySeparator + Code) or (Code = 'en');
+      Available := DirectoryExists(GetAppShareDir('Localization' + DirectorySeparator + Code)) or (Code = 'en');
     end;
   end;
@@ -1517 +1517 @@
       maManual: DirectHelp(cStartHelp);
       maCredits: DirectHelp(cStartCredits);
-      maAIDev: OpenDocument(HomeDir + AITemplateFileName);
+      maAIDev: OpenDocument(GetAppShareFile(AITemplateFileName));
       maWeb: OpenURL(CevoHomepage);
     end;