Changeset 184

Timestamp:

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

Author:

chronos

Message:

• Fixed: Data directories detection on Linux.

Location:

trunk

Files:

• Core.lfm (modified) (1 diff)
• Core.pas (modified) (3 diffs)
• Forms/FormMain.pas (modified) (3 diffs)
• Install/flatpak/net.zdechov.app.LazFuck.yml (modified) (2 diffs)

trunk/Core.lfm

@@ -545 +545 @@
   end
   object Translator: TTranslator
-    POFilesFolder = 'Languages'
+    POFilesFolder = 'Languages;Packages/Common/Languages'
     OnTranslate = TranslatorTranslate
     Left = 108

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}
 

trunk/Forms/FormMain.pas

@@ -206 +206 @@
   SFileNotFound = 'File %s not found.';
 
-const
-  ExamplesDir = 'Examples';
-
 { TFormMain }
 
@@ -217 +214 @@
   try
     if Core.Core.LastOpenedList.Items.Count = 0 then
-      Core.Core.LastOpenedList.Items.Add(CombinePaths(Core.Core.DataDir, ExamplesDir +
-      DirectorySeparator + 'Sierpinski.b'));
+      Core.Core.LastOpenedList.Items.Add(Core.Core.ExamplesDir +
+        DirectorySeparator + 'Sierpinski.b');
 
     if Core.Core.OpenProjectOnStart and (Core.Core.LastOpenedList.Items.Count > 0) and
@@ -751 +748 @@
   AProjectClose.Execute;
   if Core.Core.Project.Openned then Exit;
-  Core.Core.Project.FileName := CombinePaths(Core.Core.DataDir, ExamplesDir + DirectorySeparator + SNewProject + '.b');
+  Core.Core.Project.FileName := SNewProject + '.b';
+  Core.Core.Project.Openned := True;
   FormSourceCode.SynEditSource.Clear;
-  Core.Core.Project.Openned := True;
   Core.Core.CurrentTarget.Compiled := False;
   UpdateInterface;

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

@@ -27 +27 @@
       - type: svn
         url: https://svn.zdechov.net/LazFuck/trunk
-        revision: r183
+        revision: r184
     buildsystem: simple
     build-commands:
@@ -35 +35 @@
       - install -Dm755 LazFuck -t $FLATPAK_DEST/bin
       - install -Dm644 Install/deb/LazFuck.desktop -t $FLATPAK_DEST/share/applications
-      - install -Dm644 Images/256x256/LazFuck.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps
+      - install -Dm644 Images/256x256/LazFuck.png -t $FLATPAK_DEST/share/icons/hicolor/256x256/apps
       - install -Dm644 Languages/*.po -t $FLATPAK_DEST/share/LazFuck/Languages
       - install -Dm644 Packages/Common/Languages/*.po -t $FLATPAK_DEST/share/LazFuck/Languages