Skip to content

Commit 1a413c6

Browse files
authored
Add [/usr]/lib/aarch64-linux-gnu/ to LD_LIBRARY_PATH (#568)
* Add [/usr]/lib/aarch64-linux-gnu/ to LD_LIBRARY_PATH * Try neovim test again
1 parent c33162a commit 1a413c6

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,24 @@ jobs:
4141
run: |
4242
bash -ex dogfeeding.sh
4343
44-
- name: Test to create Hello AppImage
44+
- name: Test to create neovim AppImage
4545
run: |
4646
chmod +x ./out/pkg2appimage*.AppImage*
47-
./out/pkg2appimage*.AppImage* recipes/hello.yml
47+
./out/pkg2appimage*.AppImage* recipes/neovim.yml
4848
4949
- name: Verify AppImage Creation and Test
5050
run: |
51-
if ls out/hello-*.AppImage 1> /dev/null 2>&1; then
52-
echo "hello AppImage successfully created."
53-
./out/hello-*.AppImage | tee output.txt
54-
if grep -q "Hello, world!" output.txt; then
55-
echo "hello AppImage test passed."
51+
if ls out/neovim-*.AppImage 1> /dev/null 2>&1; then
52+
echo "neovim AppImage successfully created."
53+
./out/neovim-*.AppImage -v | tee output.txt
54+
if grep -q "Build type: Release" output.txt; then
55+
echo "neovim AppImage test passed."
5656
else
57-
echo "hello AppImage test failed." >&2
57+
echo "neovim AppImage test failed." >&2
5858
exit 1
5959
fi
6060
else
61-
echo "Failed to create hello AppImage." >&2
61+
echo "Failed to create neovim AppImage." >&2
6262
exit 1
6363
fi
6464

pkg2appimage

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
HERE="$(dirname "$(readlink -f "${0}")")"
44

55
export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/sbin/:"${HERE}"/usr/games/:"${HERE}"/bin/:"${HERE}"/sbin/:"${PATH}"
6-
export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
6+
export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib/aarch64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib/aarch64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
77
export XDG_DATA_DIRS="${HERE}"/usr/share/:"${XDG_DATA_DIRS}"
88

99

@@ -329,13 +329,13 @@ HERE="$(dirname "$(readlink -f "${0}")")"
329329
export UNION_PRELOAD="${HERE}"
330330
export LD_PRELOAD="${HERE}/libunionpreload.so"
331331
export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/sbin/:"${HERE}"/usr/games/:"${HERE}"/bin/:"${HERE}"/sbin/:"${PATH}"
332-
export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
332+
export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib/aarch64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib/aarch64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
333333
export PYTHONPATH="${HERE}"/usr/share/pyshared/:"${PYTHONPATH}"
334334
export PYTHONHOME="${HERE}"/usr/
335335
export XDG_DATA_DIRS="${HERE}"/usr/share/:"${XDG_DATA_DIRS}"
336336
export PERLLIB="${HERE}"/usr/share/perl5/:"${HERE}"/usr/lib/perl5/:"${PERLLIB}"
337337
export GSETTINGS_SCHEMA_DIR="${HERE}"/usr/share/glib-2.0/schemas/:"${GSETTINGS_SCHEMA_DIR}"
338-
export QT_PLUGIN_PATH="${HERE}"/usr/lib/qt4/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib32/qt4/plugins/:"${HERE}"/usr/lib64/qt4/plugins/:"${HERE}"/usr/lib/qt5/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib32/qt5/plugins/:"${HERE}"/usr/lib64/qt5/plugins/:"${QT_PLUGIN_PATH}"
338+
export QT_PLUGIN_PATH="${HERE}"/usr/lib/qt4/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib/aarch64-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib32/qt4/plugins/:"${HERE}"/usr/lib64/qt4/plugins/:"${HERE}"/usr/lib/qt5/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib/aarch64-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib32/qt5/plugins/:"${HERE}"/usr/lib64/qt5/plugins/:"${QT_PLUGIN_PATH}"
339339
EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2- | sed -e 's|%.||g')
340340
exec ${EXEC} "$@"
341341
EOF

0 commit comments

Comments
 (0)