NeonXP/features
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Python: Install python tools if python exists (#51)

Browse source 
* fix python

* fix []

* fix group

* fix path

* remove duplicate chown

* use INSTALL_PATH's py
This commit is contained in:
Samruddhi Khandale 2022-06-17 15:27:19 -07:00 committed by GitHub
parent 29a3fcbb2e
commit 172dbe0840
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/python/install.sh
View file

@ -365,13 +365,15 @@ if [ "${PYTHON_VERSION}" != "none" ]; then
chown -R "${USERNAME}:python" "${PYTHON_INSTALL_PATH}" chown -R "${USERNAME}:python" "${PYTHON_INSTALL_PATH}"
chmod -R g+r+w "${PYTHON_INSTALL_PATH}" chmod -R g+r+w "${PYTHON_INSTALL_PATH}"
find "${PYTHON_INSTALL_PATH}" -type d | xargs -n 1 chmod g+s find "${PYTHON_INSTALL_PATH}" -type d | xargs -n 1 chmod g+s
PATH="${INSTALL_PATH}/bin:${PATH}"
fi fi
# Install Python tools if needed # Install Python tools if needed
if [ "${INSTALL_PYTHON_TOOLS}" = "true" ] && [ "${PYTHON_VERSION}" != "none" ]; then if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ $(python --version) != "" ]]; then
echo 'Installing Python tools...' echo 'Installing Python tools...'
export PIPX_BIN_DIR="${PIPX_HOME}/bin" export PIPX_BIN_DIR="${PIPX_HOME}/bin"
export PATH="${CURRENT_PATH}/bin:${PIPX_BIN_DIR}:${PATH}" PATH="${PATH}:${PIPX_BIN_DIR}"
# Create pipx group, dir, and set sticky bit # Create pipx group, dir, and set sticky bit
if ! cat /etc/group | grep -e "^pipx:" > /dev/null 2>&1; then if ! cat /etc/group | grep -e "^pipx:" > /dev/null 2>&1; then
@ -380,13 +382,14 @@ if [ "${INSTALL_PYTHON_TOOLS}" = "true" ] && [ "${PYTHON_VERSION}" != "none" ];
usermod -a -G pipx ${USERNAME} usermod -a -G pipx ${USERNAME}
umask 0002 umask 0002
mkdir -p ${PIPX_BIN_DIR} mkdir -p ${PIPX_BIN_DIR}
chown :pipx ${PIPX_HOME} ${PIPX_BIN_DIR} chown -R "${USERNAME}:pipx" ${PIPX_HOME}
chmod g+s ${PIPX_HOME} ${PIPX_BIN_DIR} chmod -R g+r+w "${PIPX_HOME}"
find "${PIPX_HOME}" -type d | xargs -n 1 chmod g+s
# Update pip if not using os provided python # Update pip if not using os provided python
if [ ${PYTHON_VERSION} != "os-provided" ] && [ ${PYTHON_VERSION} != "system" ] && [ ${PYTHON_VERSION} != "none" ]; then if [[ $(python --version) != "" ]] || [[ ${PYTHON_VERSION} != "os-provided" ]] && [[ ${PYTHON_VERSION} != "system" ]] && [[ ${PYTHON_VERSION} != "none" ]]; then
echo "Updating pip..." echo "Updating pip..."
"${INSTALL_PATH}/bin/python3" -m pip install --no-cache-dir --upgrade pip python -m pip install --no-cache-dir --upgrade pip
fi fi
# Install tools # Install tools
@ -411,10 +414,6 @@ if [ "${INSTALL_PYTHON_TOOLS}" = "true" ] && [ "${PYTHON_VERSION}" != "none" ];
updaterc "export PIPX_HOME=\"${PIPX_HOME}\"" updaterc "export PIPX_HOME=\"${PIPX_HOME}\""
updaterc "export PIPX_BIN_DIR=\"${PIPX_BIN_DIR}\"" updaterc "export PIPX_BIN_DIR=\"${PIPX_BIN_DIR}\""
updaterc "if [[ \"\${PATH}\" != *\"\${PIPX_BIN_DIR}\"* ]]; then export PATH=\"\${PATH}:\${PIPX_BIN_DIR}\"; fi" updaterc "if [[ \"\${PATH}\" != *\"\${PIPX_BIN_DIR}\"* ]]; then export PATH=\"\${PATH}:\${PIPX_BIN_DIR}\"; fi"
chown -R "${USERNAME}:python" "${PIPX_HOME}"
chmod -R g+r+w "${PIPX_HOME}"
find "${PIPX_HOME}" -type d | xargs -n 1 chmod g+s
fi fi
# Install JupyterLab if needed # Install JupyterLab if needed