Fix shared lib copier to work on ubuntu

jwr1 · Jan 9, 2024 · 134a89e · 134a89e
1 parent a3bf810
commit 134a89e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -93,7 +93,7 @@ jobs:
         run: |
           mv ${{ matrix.build_path }}/* linux/appimage/
           cp assets/icons/logo.png linux/appimage/interstellar.png
-          mkdir -p linux/appimage/usr/lib/ && cp $(echo $(ldd -d linux/appimage/interstellar | grep -o '/usr/lib[^ ]*') $(ldd -d linux/appimage/lib/libflutter_linux_gtk.so | grep -o '/usr/lib/[^ ]*')  | tr ' ' '\n' | sort | uniq -u) linux/appimage/usr/lib/
+          cp $(echo $(ldd -d linux/appimage/interstellar | grep -Eo ' (/usr)?/lib/[^ ]*') $(ldd -d linux/appimage/lib/libflutter_linux_gtk.so | grep -Eo ' (/usr)?/lib/[^ ]*')  | tr ' ' '\n' | sort | uniq -u) linux/appimage/lib/
           appimagetool linux/appimage interstellar-${{ matrix.target }}.AppImage
 
       - name: Compress build for Windows

diff --git a/linux/appimage/AppRun b/linux/appimage/AppRun
@@ -1,4 +1,3 @@
 #!/bin/sh
 cd "$(dirname "$0")"
-export LD_LIBRARY_PATH=usr/lib
-exec ./interstellar
+LD_LIBRARY_PATH=lib ./interstellar
diff --git a/linux/appimage/interstellar.desktop b/linux/appimage/interstellar.desktop
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Type=Application
-Terminal=false
 Name=Interstellar
-Exec=interstellar %U
+Exec=LD_LIBRARY_PATH=lib ./interstellar %u
 Icon=interstellar
-Categories=Network;
+Categories=Network