From 1be19e5f120b5a661c9fc976e7702a9336d4e511 Mon Sep 17 00:00:00 2001 From: Brendan Black Date: Sat, 25 Sep 2021 00:05:14 +0100 Subject: [PATCH] Account for differences between test vm & build vm my test vm has some extra *.so library symlinks so some patchelf commands were failing on the jenkins build vm - this changes the patchelf command to catch all the possible copied libraries --- build_appimage.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build_appimage.sh b/build_appimage.sh index e464c54..099a895 100755 --- a/build_appimage.sh +++ b/build_appimage.sh @@ -72,9 +72,9 @@ cp -a /lib64/libharfbuzz.so* appdir/usr/lib cp -a /usr/lib64/libfontconfig.so* appdir/usr/lib cp -a /usr/lib64/libfreetype.so* appdir/usr/lib cp -a /usr/lib64/libpng15.so* appdir/usr/lib -patchelf --set-rpath \$ORIGIN appdir/usr/lib/libfontconfig.so -patchelf --set-rpath \$ORIGIN appdir/usr/lib/libfreetype.so -patchelf --set-rpath \$ORIGIN appdir/usr/lib/libharfbuzz.so +patchelf --set-rpath \$ORIGIN appdir/usr/lib/libfontconfig.so* +patchelf --set-rpath \$ORIGIN appdir/usr/lib/libfreetype.so* +patchelf --set-rpath \$ORIGIN appdir/usr/lib/libharfbuzz.so* #modify the desktop file so that linuxdeployqt doesn't barf (version to 1.0, add semicolon to end of certain line types) sed -i 's/^Categor.*/&;/ ; s/^Keyword.*/&;/ ; s/1\.1/1\.0/' appdir/usr/share/applications/org.flightgear.FlightGear.desktop