Skip to content

Local file issue and pip options #23

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
merged 2 commits into from
Mar 4, 2020
Merged

Local file issue and pip options #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c35675
Resolved issue if a local Python source is referenced
brogon Mar 3, 2020
dcd8f14
Allow relative PYTHON_SOURCE path
brogon Mar 3, 2020
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
27 changes: 20 additions & 7 deletions linuxdeploy-plugin-python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,21 +106,34 @@ else
mkdir -p "${PYTHON_BUILD_DIR}"
fi

# check if the given sources are a local file or directory; if yes,
# "save" the full path. It might've been given relative to the current
# directory.
if [ -e "${PYTHON_SOURCE}" ]; then
PYTHON_SOURCE=$( readlink -f "${PYTHON_SOURCE}" )
fi

cd "${PYTHON_BUILD_DIR}"



# Install Python from sources
source_dir=$(basename "${PYTHON_SOURCE}")
source_file=$(basename "${PYTHON_SOURCE}")
if [[ "${PYTHON_SOURCE}" == http* ]] || [[ "${PYTHON_SOURCE}" == ftp* ]]; then
wget -c --no-check-certificate "${PYTHON_SOURCE}"
else
cp -r "${source_dir}" "."
cp -r "${PYTHON_SOURCE}" "."
fi
if [[ "${source_dir}" == *.tgz ]] || [[ "${source_dir}" == *.tar.gz ]]; then
filename="${source_dir%.*}"
[[ -f $filename ]] || tar -xzf "${source_dir}"
source_dir="$filename"
if [[ "${source_file}" == *.tgz ]] || [[ "${source_file}" == *.tar.gz ]]; then
if [[ "${source_file}" == *.tgz ]]; then
dirname="${source_file%.*}"
else
dirname="${source_file%.*.*}"
fi
[[ -f $dirname ]] || tar -xzf "${source_file}"
source_dir="$dirname"
else
source_dir="$source_file"
fi

prefix="usr/python"
Expand All @@ -133,7 +146,7 @@ HOME="${PYTHON_BUILD_DIR}" make -j"$NPROC" DESTDIR="$APPDIR" install
if [ ! -z "${PIP_REQUIREMENTS}" ]; then
cd "${APPDIR}/${prefix}/bin"
pythons=( "python"?"."? )
HOME="${PYTHON_BUILD_DIR}" PYTHONHOME=$(readlink -f ${PWD}/..) ./${pythons[0]} -m pip install --upgrade pip
HOME="${PYTHON_BUILD_DIR}" PYTHONHOME=$(readlink -f ${PWD}/..) ./${pythons[0]} -m pip install ${PIP_OPTIONS} --upgrade pip
HOME="${PYTHON_BUILD_DIR}" PYTHONHOME=$(readlink -f ${PWD}/..) ./${pythons[0]} -m pip install ${PIP_OPTIONS} ${PIP_REQUIREMENTS}
fi

Expand Down