From 69ed110c816effefe63763a870548f8637cb705b Mon Sep 17 00:00:00 2001
From: tresf <tres.finocchiaro@gmail.com>
Date: Sun, 5 Aug 2018 19:52:25 -0400
Subject: [PATCH 1/2] Fix shim launcher Closes #4515

---
 cmake/linux/package_linux.sh.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cmake/linux/package_linux.sh.in b/cmake/linux/package_linux.sh.in
index 61afe35a02a..82eec768fdf 100644
--- a/cmake/linux/package_linux.sh.in
+++ b/cmake/linux/package_linux.sh.in
@@ -181,6 +181,9 @@ 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
+ln -sfr "${APPDIR}/usr/bin/lmms" "${APPDIR}/AppRun"
+
 # Create AppImage
 echo -e "\nFinishing the AppImage..."
 echo -e "\n\n>>>>> appimagetool" >> "$LOGFILE"

From c799b69a5317fcc3ea59dde59719b18ddae77c1b Mon Sep 17 00:00:00 2001
From: tresf <tres.finocchiaro@gmail.com>
Date: Sun, 5 Aug 2018 20:13:45 -0400
Subject: [PATCH 2/2] Bugs

---
 cmake/linux/package_linux.sh.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmake/linux/package_linux.sh.in b/cmake/linux/package_linux.sh.in
index 82eec768fdf..99c5aebc1c3 100644
--- a/cmake/linux/package_linux.sh.in
+++ b/cmake/linux/package_linux.sh.in
@@ -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"
 echo -e "\nDownloading linuxdeployqt to ${LINUXDEPLOYQT}..."
 mkdir -p "$HOME/bin"
 DAYSOLD=2
@@ -69,7 +70,6 @@ elif ! find "$LINUXDEPLOYQT" -mtime -$DAYSOLD 2>/dev/null|grep -q "." > /dev/nul
 	touch "$LINUXDEPLOYQT"
 	success "Downloaded $LINUXDEPLOYQT"
 	"$LINUXDEPLOYQT" --appimage-extract > /dev/null 2>&1
-	APPIMAGETOOL="squashfs-root/usr/bin/appimagetool"
 	success "Extracted $APPIMAGETOOL"
 else
 	skipped "$LINUXDEPLOYQT is less than $DAYSOLD days old"
@@ -182,7 +182,8 @@ if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then
 fi
 
 # Point the AppRun to the shim launcher
-ln -sfr "${APPDIR}/usr/bin/lmms" "${APPDIR}/AppRun"
+rm -f "${APPDIR}/AppRun"
+ln -sr "${APPDIR}/usr/bin/lmms" "${APPDIR}/AppRun"
 
 # Create AppImage
 echo -e "\nFinishing the AppImage..."