Add a dedicated AppRun

Note that PYTHON_ENTRYPOINT has been relocated to AppRun. Use the
the APPRUN_ENTRYPOINT option instead (e.g. see xonsh recipe).

Author: niess

appimage/build-python.sh

@@ -69,11 +69,15 @@ cp "${REPO_ROOT}/appimage/resources/python.desktop" "${name}.desktop"
 sed -i "s|[{][{]exe[}][}]|${exe}|g" "${name}.desktop"
 sed -i "s|[{][{]name[}][}]|${name}|g" "${name}.desktop"
 
+cp "${REPO_ROOT}/appimage/resources/apprun.sh" "AppRun"
+sed -i "s|[{][{]exe[}][}]|${exe}|g" "AppRun"
+sed -i "s|[{][{]entrypoint[}][}]|${APPRUN_ENTRYPOINT}|g" "AppRun"
+
 ./"${linuxdeploy}" --appdir AppDir \
                    --plugin python \
                    -i "${REPO_ROOT}/appimage/resources/python.png" \
                    -d "${name}.desktop" \
-                   --custom-apprun "AppDir/usr/bin/${exe}" \
+                   --custom-apprun "AppRun" \
                    --output "appimage"
 
 popd

appimage/recipes/scipy.sh

@@ -1,5 +1,2 @@
 export PYTHON_VERSION="3.8.1"
 export PIP_REQUIREMENTS="numpy scipy matplotlib sympy pandas"
-
-export LD_LIBRARY_PATH="AppDir/usr/python/lib/python3.8/site-packages/numpy/.libs:${LD_LIBRARY_PATH}"
-export LD_LIBRARY_PATH="AppDir/usr/python/lib/python3.8/site-packages/matplotlib/.libs:${LD_LIBRARY_PATH}"

appimage/recipes/xonsh.sh

@@ -1,3 +1,3 @@
 export PYTHON_VERSION="3.8.1"
 export PIP_REQUIREMENTS="xonsh prompt_toolkit gnureadline Pygments"
-export PYTHON_ENTRYPOINT='"-u" "-c" "from xonsh.main import main; main()"'
+export APPRUN_ENTRYPOINT='"-u" "-c" "from xonsh.main import main; main()"'

appimage/resources/apprun.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+SCRIPT=`readlink -f -- $0`
+SCRIPTPATH=`dirname $SCRIPT`
+APPDIR="${APPDIR:-$SCRIPTPATH}"
+
+${APPDIR}/usr/bin/{{exe}} {{entrypoint}} "$@"

linuxdeploy-plugin-python.sh

@@ -20,8 +20,6 @@ script=$(readlink -f $0)
 exe_name="$(basename ${APPIMAGE:-$script})"
 BASEDIR="${APPDIR:-$(readlink -m $(dirname $script))}"
 
-PYTHON_ENTRYPOINT="${PYTHON_ENTRYPOINT:-}"
-
 # Parse the CLI
 show_usage () {
     echo "Usage: ${exe_name} --appdir <path to AppDir>"
@@ -48,9 +46,6 @@ show_usage () {
     echo "      Provide extra configuration flags for the Python build. Note"
     echo "      that the install prefix will be overwritten"
     echo ""
-    echo "  PYTHON_ENTRYPOINT=\"${PYTHON_ENTRYPOINT}\""
-    echo "      Extra options when calling the python executable"
-    echo ""
     echo "  PYTHON_SOURCE=\"${PYTHON_SOURCE}\""
     echo "      The source to use for Python. Can be a directory, an url or/and"
     echo "      an archive"
@@ -171,7 +166,6 @@ do
         cp "${BASEDIR}/share/python-wrapper.sh" "$python"
         sed -i "s|[{][{]PYTHON[}][}]|$python|g" "$python"
         sed -i "s|[{][{]PREFIX[}][}]|$prefix|g" "$python"
-        sed -i "s|[{][{]ENTRYPOINT[}][}]|$PYTHON_ENTRYPOINT|g" "$python"
     fi
 done
 

share/python-wrapper.sh

@@ -38,5 +38,5 @@ fi
 # Wrap the call to Python in order to mimic a call from the source
 # executable ($ARGV0), but potentially located outside of the Python
 # install ($PYTHONHOME)
-(PYTHONHOME="${APPDIR}/${prefix}" exec -a "${executable}" "$APPDIR/${prefix}/bin/${nickname}" {{ENTRYPOINT}} "$@")
+(PYTHONHOME="${APPDIR}/${prefix}" exec -a "${executable}" "$APPDIR/${prefix}/bin/${nickname}" "$@")
 exit "$?"