diff --git a/scripts/create_kiwix-desktop_appImage.sh b/scripts/create_kiwix-desktop_appImage.sh index 7738fe5..fc773e6 100755 --- a/scripts/create_kiwix-desktop_appImage.sh +++ b/scripts/create_kiwix-desktop_appImage.sh @@ -6,6 +6,10 @@ INSTALLDIR=${1:-$PWD/BUILD_native_dyn/INSTALL} SOURCEDIR=${2:-$PWD/SOURCE/kiwix-desktop} APPDIR=${3:-$PWD/AppDir} +SYSTEMLIBDIR=lib/x86_64-linux-gnu +# Uncoment if needed +SYSTEMLIBDIR=lib64 + #TODO We should have our icon ICONFILE=$SOURCEDIR/resources/icons/kiwix/app_icon.svg DESKTOPFILE=$SOURCEDIR/resources/org.kiwix.desktop.desktop @@ -14,14 +18,14 @@ DESKTOPFILE=$SOURCEDIR/resources/org.kiwix.desktop.desktop mkdir -p $APPDIR/usr/{bin,lib,share} $APPDIR/usr/share/applications $APPDIR/usr/share/icons/hicolor/48x48/apps # Copy our files cp $INSTALLDIR/bin/kiwix-desktop $APPDIR/usr/bin/ -cp $INSTALLDIR/lib/x86_64-linux-gnu/*.so* $APPDIR/usr/lib +cp $INSTALLDIR/$SYSTEMLIBDIR/*.so* $APPDIR/usr/lib # Remove it as it break with linuxdeployqt (should we compile without it) ? rm $APPDIR/usr/lib/libmagic.so* # Copy nss lib (to not conflict with host's ones) -cp -a /usr/lib/x86_64-linux-gnu/nss $APPDIR/usr/lib -cp -a /usr/lib/x86_64-linux-gnu/libstdc++.so* $APPDIR/usr/lib -cp -a /usr/lib/x86_64-linux-gnu/libc.so* $APPDIR/usr/lib -cp -a /usr/lib/x86_64-linux-gnu/libz.so* $APPDIR/usr/lib +cp -a /usr/$SYSTEMLIBDIR/nss $APPDIR/usr/lib +cp -a /usr/$SYSTEMLIBDIR/libstdc++.so* $APPDIR/usr/lib +cp -a /usr/$SYSTEMLIBDIR/libc.so* $APPDIR/usr/lib +cp -a /usr/$SYSTEMLIBDIR/libz.so* $APPDIR/usr/lib cp $ICONFILE $APPDIR/usr/share/icons/hicolor/48x48/apps/kiwix-desktop.svg mkdir -p $APPDIR/usr/share/applications cp $DESKTOPFILE $APPDIR/usr/share/applications/kiwix-desktop.desktop