fly/fgmeta
1
0
Fork 0
Code Activity

AppImage: default to launch, fix osgDB plugin loading

Browse source 
When no arguments are pased to the AppImage, start with
the launcher for a pleasant experience.

Adjust the RPath on our copied osgDB plugins, so that dependencies
are found at the bundled lib dir.
This commit is contained in:
Automatic Release Builder 2020-11-19 21:22:45 +00:00
parent 79ee40e885
commit 7e26d650bc
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build_appimage.sh
View file

@ -45,6 +45,11 @@ cp -d dist/lib64/* appdir/usr/lib
cp -d dist/lib/* appdir/usr/lib cp -d dist/lib/* appdir/usr/lib
cp -a dist/lib/osgPlugins-3.6.5 appdir/usr/lib cp -a dist/lib/osgPlugins-3.6.5 appdir/usr/lib
# adjust the rpath on the copied plugins, so they don't
# require LD_LIBRARY_PATH to be set to load their dependencies
# correctly
patchelf --set-rpath \$ORIGIN/../ appdir/usr/lib/osgPlugins-3.6.5/*.so
cp -r dist/share appdir/usr cp -r dist/share appdir/usr
# FIXME : only copy the QML plugins we actually need # FIXME : only copy the QML plugins we actually need
@ -68,11 +73,16 @@ sed -i 's/^Categor.*/&;/ ; s/^Keyword.*/&;/ ; s/1\.1/1\.0/' appdir/usr/share/app
cat << 'EOF' > appdir/AppRun cat << 'EOF' > appdir/AppRun
#!/bin/bash #!/bin/bash
HERE="$(dirname "$(readlink -f "${0}")")" HERE="$(dirname "$(readlink -f "${0}")")"
export SIMGEAR_TLS_CERT_PATH=$HERE/usr/ssl/cacert.pem export SIMGEAR_TLS_CERT_PATH=$HERE/usr/ssl/cacert.pem
echo SIMGEAR_TLS_CERT_PATH=$SIMGEAR_TLS_CERT_PATH export OSG_LIBRARY_PATH=${HERE}/usr/lib
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${HERE}/usr/lib
echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH if [[ $# -eq 0 ]]; then
exec "${HERE}/usr/bin/fgfs" "$@" echo "Started with no arguments; assuming --launcher"
exec "${HERE}/usr/bin/fgfs" --launcher
else
exec "${HERE}/usr/bin/fgfs" "$@"
fi
EOF EOF