Changeset 371

Timestamp:

Jan 2, 2025, 9:02:57 PM (2 days ago)

Author:

chronos

Message:

• Modified: Improved base directory detection.

Location:

trunk

Files:

• Core.pas (modified) (4 diffs)
• Install/flatpak/net.zdechov.app.xTactics.yml (modified) (3 diffs)

trunk/Core.pas

@@ -74 +74 @@
     GameLoaded: Boolean;
     FormNewTabIndex: Integer;
-    GameFilesDir: string;
+    BaseDir: string;
     procedure LoadRecentExecute(Sender: TObject);
     procedure StartNewGame;
@@ -518 +518 @@
 
 procedure TCore.DataModuleCreate(Sender: TObject);
-{$IFDEF Linux}
+{$IFDEF UNIX}
 const
-  LinuxGameFilesDir = '/usr/share/xtactics';
-  LinuxLanguagesDir = LinuxGameFilesDir + '/Languages';
+  LinuxBaseDir = '/usr/share/xtactics';
+  LinuxLanguagesDir = LinuxBaseDir + '/Languages';
+  LinuxBaseDir2 = '/app/share/xtactics';
+  LinuxLanguagesDir2 = LinuxBaseDir2 + '/Languages';
 {$ENDIF}
 begin
-  GameFilesDir := ExtractFilePath(ParamStr(0));
-  {$IFDEF Linux}
+  BaseDir := ExtractFilePath(ParamStr(0));
+  Translator1.POFilesFolder := BaseDir + DirectorySeparator + 'Languages';
+
+  {$IFDEF UNIX}
   // If installed in Linux system then use installation shared game directory for data files
-  if DirectoryExists(LinuxGameFilesDir) then
-    GameFilesDir := LinuxGameFilesDir;
+  if not DirectoryExists(BaseDir) and DirectoryExists(LinuxBaseDir) then
+    BaseDir := LinuxBaseDir;
+
+  if not DirectoryExists(BaseDir) and DirectoryExists(LinuxBaseDir2) then
+    BaseDir := LinuxBaseDir2;
+
   // If installed in Linux system then use installation directory for po files
   if not DirectoryExists(Translator1.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
     Translator1.POFilesFolder := LinuxLanguagesDir;
+  if not DirectoryExists(Translator1.POFilesFolder) and DirectoryExists(LinuxLanguagesDir2) then
+    Translator1.POFilesFolder := LinuxLanguagesDir2;
   {$ENDIF}
 
@@ -544 +554 @@
   Game.OnNewTurn := GameNewTurnExecute;
   Game.OnPlayerChange := DoPlayerChange;
-  Game.MapImageFileName := CombinePaths(GameFilesDir, 'Images' + DirectorySeparator + 'Maps' + DirectorySeparator + 'WorldMap.png');
+  Game.MapImageFileName := CombinePaths(BaseDir, 'Images' + DirectorySeparator + 'Maps' + DirectorySeparator + 'WorldMap.png');
   Server.Game := Game;
   LocalClients.Game := Game;
@@ -674 +684 @@
   DefaultGameSystemName = 'Default';
 begin
-  if GameFilesDir <> '' then
-    SystemsDir := GameFilesDir + DirectorySeparator + GameSystemsDirName
+  if BaseDir <> '' then
+    SystemsDir := BaseDir + DirectorySeparator + GameSystemsDirName
     else SystemsDir := ExpandFileName(GameSystemsDirName);
   if DirectoryExists(SystemsDir) then begin

trunk/Install/flatpak/net.zdechov.app.xTactics.yml

@@ -27 +27 @@
       - type: svn
         url: https://svn.zdechov.net/xtactics/trunk
-        revision: r370
+        revision: r371
     buildsystem: simple
     build-commands:
@@ -33 +33 @@
         . /usr/lib/sdk/freepascal/enable.sh
         lazbuild --build-mode=Release --ws=qt5 xtactics.lpi
-      - install -Dm755 xtactics -t $FLATPAK_DEST/share/xTactics
-      - install -d $FLATPAK_DEST/bin
-      - ln -s $FLATPAK_DEST/share/xTactics/xtactics $FLATPAK_DEST/bin/xtactics
+      - install -Dm755 xtactics -t $FLATPAK_DEST/bin
       - install -Dm644 Install/deb/xtactics.desktop -t $FLATPAK_DEST/share/applications
       - install -Dm644 Install/deb/xtactics.xml $FLATPAK_DEST/share/mime/packages/$FLAPTAK_ID.xml
-      - install -Dm644 Images/64x64/xtactics.png -t $FLATPAK_DEST/share/icons/hicolor/64x64/apps
       - install -Dm644 Languages/*.po -t $FLATPAK_DEST/share/xtactics/Languages
       - install -Dm644 Packages/Common/Languages/*.po -t $FLATPAK_DEST/share/xtactics/Languages
@@ -45 +42 @@
       - install -d -m 755 $FLATPAK_DEST/share/xtactics/Images
       - cp -r Images/Maps $FLATPAK_DEST/share/xtactics/Images
+      - install -Dm644 Images/64x64/xtactics.png -t $FLATPAK_DEST/share/icons/hicolor/64x64/apps
       - install -Dm644 Install/flatpak/${FLATPAK_ID}.metainfo.xml -t $FLATPAK_DEST/share/metainfo