Sitelet https://github.com/niess/linuxdeploy-plugin-python/pull/11/files
Skip to content

Add python entrypoint #11

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.

Sign up for GitHub

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

Merged
niess merged 7 commits into from
Oct 17, 2019
Merged

Add python entrypoint #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d579c13
simple fix of sanitizing
anki-code Oct 14, 2019
93211b2
python entrypoint + xonsh example
Oct 14, 2019
12464de
Revert "python entrypoint + xonsh example"
Oct 14, 2019
7c1bce2
python entrypoint + xonsh example
Oct 14, 2019
a9dd153
Set APPDIR if empty for usage extracted appimage
anki-code Oct 15, 2019
4056cc2
readline to LD_LIBRARY_PATH
anki-code Oct 15, 2019
f5267db
xonsh example
anki-code Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ set -ex
./appimage/build-python.sh python2
./appimage/build-python.sh python3
./appimage/build-python.sh scipy
./appimage/build-python.sh xonsh

python3 -m tests
4 changes: 4 additions & 0 deletions appimage/recipes/xonsh.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export PYTHON_VERSION="3.7.3"
export PIP_REQUIREMENTS="xonsh prompt_toolkit gnureadline Pygments"
export PYTHON_ENTRYPOINT='"-u" "-c" "from xonsh.main import main; main()"'
export LD_LIBRARY_PATH="AppDir/usr/python/lib/python3.7/site-packages/.libsgnureadline:${LD_LIBRARY_PATH}"
4 changes: 3 additions & 1 deletion linuxdeploy-plugin-python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ script=$(readlink -f $0)
exe_name="$(basename ${APPIMAGE:-$script})"
BASEDIR="${APPDIR:-$(readlink -m $(dirname $script))}"

PYTHON_ENTRYPOINT="${PYTHON_ENTRYPOINT:-}"

# Parse the CLI
show_usage () {
Expand Down Expand Up @@ -153,6 +154,7 @@ 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

Expand All @@ -162,7 +164,7 @@ cd "$APPDIR/${prefix}/bin"
for exe in $(ls "${APPDIR}/${prefix}/bin"*)
do
if [[ -f "$exe" ]] && [[ -x "$exe" ]]; then
sed -i '1s|^#!.*\(python[0-9.]*\)|#!/bin/sh\n"exec" "$(dirname $(readlink -f $\{0\}))/../../bin/\1" "$0" "$@"|' "$exe"
sed -i '1s|^#!.*\(python[0-9.]*\).*|#!/bin/sh\n"exec" "$(dirname $(readlink -f $\{0\}))/../../bin/\1" "$0" "$@"|' "$exe"
fi
done

Expand Down
6 changes: 5 additions & 1 deletion share/python-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

SCRIPT=`realpath $0`
SCRIPTPATH=`dirname $SCRIPT`
APPDIR="${APPDIR:-$SCRIPTPATH/../..}"

# Configure the environment
prefix="{{PREFIX}}"
export TCL_LIBRARY="${APPDIR}/${prefix}/share/tcltk/tcl"*
Expand Down Expand Up @@ -34,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}" "$@")
(PYTHONHOME="${APPDIR}/${prefix}" exec -a "${executable}" "$APPDIR/${prefix}/bin/${nickname}" {{ENTRYPOINT}} "$@")
exit "$?"