Changeset 225 for trunk

Timestamp:

Jan 20, 2025, 12:57:50 AM (2 days ago)

Author:

chronos

Message:

• Fixed: Detect relative Linux share application path.
• Fixed: Package install scripts.

Location:

trunk

Files:

• Core.pas (modified) (2 diffs)
• Forms/FormMain.pas (modified) (1 diff)
• Install/deb/debian/compat (modified) (1 diff)
• Install/deb/debian/rules (modified) (1 diff)
• Install/flatpak (modified) (1 prop)
• Install/flatpak/net.zdechov.app.AcronymDecoder.yml (modified) (2 diffs)
• Install/snap/snapcraft.yaml (modified) (1 diff)

trunk/Core.pas

@@ -146 +146 @@
 
 function TCore.GetAppShareDir(Dir: string): string;
-{$IFDEF Linux}
+{$IFDEF UNIX}
 var
   NewDir: string;
@@ -152 +152 @@
 begin
   Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Dir;
-  {$IFDEF Linux}
+  {$IFDEF UNIX}
   // If installed in Linux system then try to use different installation directory
   if not DirectoryExists(Result) then begin
-    NewDir := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Dir;
+    NewDir := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
+      DirectorySeparator + 'share' + DirectorySeparator +
+      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Dir;
     if DirectoryExists(NewDir) then Result := NewDir;
   end;

trunk/Forms/FormMain.pas

@@ -794 +794 @@
   LastOpenedList1.LoadFromRegistry(RegistryContext);
 
-  {$IFDEF Linux}
-  // If installed in Linux system then use installation directory for po files
-  if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
-    Core.Core.Translator.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
-  {$ENDIF}
-
   with TRegistryEx.Create do
   try

trunk/Install/deb/debian/compat

@@ -1 @@
-8
+10

trunk/Install/deb/debian/rules

@@ -14 +14 @@
 
 override_dh_auto_install:
-        install -d -m 755 $(ROOT)/usr/bin
-        install -s -m 755 AcronymDecoder $(ROOT)/usr/bin
-        install -d -m 755 $(ROOT)/usr/share/AcronymDecoder/languages
-        install -m 644 Languages/AcronymDecoder.pot $(ROOT)/usr/share/AcronymDecoder/languages
-        install -m 644 Languages/AcronymDecoder.cs.po $(ROOT)/usr/share/AcronymDecoder/languages
-        install -d -m 755 $(ROOT)/usr/share/AcronymDecoder/Examples
-        @install -D -m 644 Examples/* $(ROOT)/usr/share/AcronymDecoder/Examples || true
-        install -d -m 755 $(ROOT)/usr/share/mime/packages
-        install -m 644 Install/shared/acronym-decoder.xml $(ROOT)/usr/share/mime/packages
-        install -d -m 755 $(ROOT)/usr/share/applications
-        install -m 755 Install/shared/AcronymDecoder.desktop $(ROOT)/usr/share/applications
-        install -d -m 755 $(ROOT)/usr/share/pixmaps
-        install -m 644 Images/AcronymDecoder.png $(ROOT)/usr/share/pixmaps
-        install -m 644 Images/AcronymDecoder.png $(ROOT)/usr/share/pixmaps/application-adp.png
+        install -Dm755 AcronymDecoder -t $(ROOT)/usr/bin
+        install -Dm644 Languages/*.po -t $(ROOT)/usr/share/AcronymDecoder/Languages
+        install -Dm644 Packages/Common/Languages/*.po -t $(ROOT)/usr/share/AcronymDecoder/Languages
+        install -Dm644 Install/shared/acronym-decoder.xml -t $(ROOT)/usr/share/mime/packages
+        install -Dm644 Install/shared/AcronymDecoder.desktop -t $(ROOT)/usr/share/applications
+        install -Dm644 Images/AcronymDecoder.png -t $(ROOT)/usr/share/icons/hicolor/256x256/apps
+        install -Dm644 Images/AcronymDecoder.png $(ROOT)/usr/share/pixmaps/application-adp.png
+        install -Dm644 Examples/*.adp -t $(ROOT)/usr/share/AcronymDecoder/Examples
 
 %:

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

@@ -27 +27 @@
       - type: svn
         url: https://svn.zdechov.net/AcronymDecoder/trunk
-        revision: r224
+        revision: r225
     buildsystem: simple
     build-commands:
@@ -33 +33 @@
         . /usr/lib/sdk/freepascal/enable.sh
         lazbuild --build-mode=Release --ws=qt5 AcronymDecoder.lpi
-      - install -Dm755 AcronymDecoder -t $FLATPAK_DEST/bin/AcronymDecoder
+      - install -Dm755 AcronymDecoder -t $FLATPAK_DEST/bin
       - install -Dm644 Languages/*.po -t $FLATPAK_DEST/share/AcronymDecoder/Languages
       - install -Dm644 Packages/Common/Languages/*.po -t $FLATPAK_DEST/share/AcronymDecoder/Languages
-      - install -Dm644 Install/shared/acronym-decoder.xml -D $FLATPAK_DEST/share/mime/packages
+      - install -Dm644 Install/shared/acronym-decoder.xml -t $FLATPAK_DEST/share/mime/packages
       - install -Dm644 Install/shared/AcronymDecoder.desktop -t $FLATPAK_DEST/share/applications
       - install -Dm644 Images/AcronymDecoder.png -t $FLATPAK_DEST/share/icons/hicolor/256x256/apps

trunk/Install/snap/snapcraft.yaml

@@ -35 +35 @@
       snapcraftctl build
       lazbuild --build-mode=Release AcronymDecoder.lpi
-      install -Dm755 AcronymDecoder -t $SNAPCRAFT_PART_INSTALL/usr/bin/AcronymDecoder
+      install -Dm755 AcronymDecoder -t $SNAPCRAFT_PART_INSTALL/usr/bin
       install -Dm644 Languages/*.po -t $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
       install -Dm644 Packages/Common/Languages/*.po -t $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
-      install -Dm644 Install/shared/acronym-decoder.xml -D $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages
+      install -Dm644 Install/shared/acronym-decoder.xml -t $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages
       install -Dm644 Install/shared/AcronymDecoder.desktop -t $SNAPCRAFT_PART_INSTALL/usr/share/applications
       install -Dm644 Images/AcronymDecoder.png -t $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps