Fix shim launcher #4525
Merged
Fix shim launcher #4525
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closes LMMS#4515
PhysSong
approved these changes
Aug 6, 2018
tresf
commented
Aug 6, 2018
| @@ -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" | |||
There was a problem hiding this comment.
This was a bug that prevents make appimage from working if the linuxdeployqt is cached on the system.
There was a problem hiding this comment.
How? And what's the difference?
There was a problem hiding this comment.
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
commented
Aug 6, 2018
| @@ -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" | |||
There was a problem hiding this comment.
The .AppImage wasn't working using -sfr (symbolic, force, relative), so I put the rm command in explicitly which seems to fix it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #4515
Upstream
linuxdeployqtpatched behavior that allowed us to bundle our.AppImageusing againlmms.realwhile theAppRunsymlink would point to a shim script calledlmms. This was an undocumented and non-intuitive feature and it's been removed.In reaction to this change, we just need to repoint the
AppRunourselves to thelmmsshim script.