New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix shim launcher #4525

Merged
merged 2 commits into from Aug 6, 2018

Conversation

Projects
None yet
2 participants
@tresf
Member

tresf commented Aug 5, 2018

Closes #4515

Upstream linuxdeployqt patched behavior that allowed us to bundle our .AppImage using again lmms.real while the AppRun symlink would point to a shim script called lmms. This was an undocumented and non-intuitive feature and it's been removed.

In reaction to this change, we just need to repoint the AppRun ourselves to the lmms shim script.

@@ -55,6 +55,7 @@ echo -e "\nWriting verbose output to \"${LOGFILE}\""
export PATH="$(pwd -P)/squashfs-root/usr/bin:$(dirname "@QT_QMAKE_EXECUTABLE@")":$PATH
# Fetch portable linuxdeployqt if cache is older than $DAYSOLD
APPIMAGETOOL="squashfs-root/usr/bin/appimagetool"

This comment has been minimized.

@tresf

tresf Aug 6, 2018

Member

This was a bug that prevents make appimage from working if the linuxdeployqt is cached on the system.

@tresf

tresf Aug 6, 2018

Member

This was a bug that prevents make appimage from working if the linuxdeployqt is cached on the system.

This comment has been minimized.

@PhysSong

PhysSong Aug 6, 2018

Member

How? And what's the difference?

@PhysSong

PhysSong Aug 6, 2018

Member

How? And what's the difference?

This comment has been minimized.

@tresf

tresf Aug 6, 2018

Member

We were only setting the variable when the tool was missing or outdated, so second run failed every time. We use the variable lower in the script.

@tresf

tresf Aug 6, 2018

Member

We were only setting the variable when the tool was missing or outdated, so second run failed every time. We use the variable lower in the script.

@@ -181,6 +181,10 @@ if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then
mv "${APPDIR}/usr/lib/libjack.so.0" "${APPDIR}usr/lib/lmms/optional/"
fi
# Point the AppRun to the shim launcher
rm -f "${APPDIR}/AppRun"

This comment has been minimized.

@tresf

tresf Aug 6, 2018

Member

The .AppImage wasn't working using -sfr (symbolic, force, relative), so I put the rm command in explicitly which seems to fix it.

@tresf

tresf Aug 6, 2018

Member

The .AppImage wasn't working using -sfr (symbolic, force, relative), so I put the rm command in explicitly which seems to fix it.

@tresf tresf merged commit b5dc70c into LMMS:stable-1.2 Aug 6, 2018

2 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@tresf tresf deleted the tresf:shim branch Aug 6, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment