mirror of
https://github.com/dw-0/kiauh.git
synced 2025-12-16 03:54:27 +05:00
fix: do not install py2 packages if venv is py3 (fixes #211)
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
@@ -148,6 +148,12 @@ function klipper_setup_dialog() {
|
|||||||
klipper_setup "${user_input[@]}"
|
klipper_setup "${user_input[@]}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
###
|
||||||
|
# extracts the required packages from the
|
||||||
|
# install-debian.sh script and installs them
|
||||||
|
#
|
||||||
|
# @param {string}: python_version - klipper-env python version
|
||||||
|
#
|
||||||
function install_klipper_packages() {
|
function install_klipper_packages() {
|
||||||
local packages python_version="${1}"
|
local packages python_version="${1}"
|
||||||
local install_script="${KLIPPER_DIR}/scripts/install-debian.sh"
|
local install_script="${KLIPPER_DIR}/scripts/install-debian.sh"
|
||||||
@@ -163,9 +169,13 @@ function install_klipper_packages() {
|
|||||||
if [[ ${python_version} == "python3" ]]; then
|
if [[ ${python_version} == "python3" ]]; then
|
||||||
### replace python-dev with python3-dev if python3 was selected
|
### replace python-dev with python3-dev if python3 was selected
|
||||||
packages="${packages//python-dev/python3-dev}"
|
packages="${packages//python-dev/python3-dev}"
|
||||||
else
|
elif [[ ${python_version} == "python2" ]]; then
|
||||||
### package name 'python-dev' is deprecated (-> no installation candidate) on more modern linux distros
|
### package name 'python-dev' is deprecated (-> no installation candidate) on more modern linux distros
|
||||||
packages="${packages//python-dev/python2-dev}"
|
packages="${packages//python-dev/python2-dev}"
|
||||||
|
else
|
||||||
|
log_error "Internal Error: missing parameter 'python_version' during function call of ${FUNCNAME[0]}"
|
||||||
|
error_msg "Internal Error: missing parameter 'python_version' during function call of ${FUNCNAME[0]}"
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "${cyan}${packages}${white}" | tr '[:space:]' '\n'
|
echo "${cyan}${packages}${white}" | tr '[:space:]' '\n'
|
||||||
@@ -470,21 +480,30 @@ function remove_klipper() {
|
|||||||
#================ UPDATE KLIPPER ================#
|
#================ UPDATE KLIPPER ================#
|
||||||
#================================================#
|
#================================================#
|
||||||
|
|
||||||
|
###
|
||||||
|
# stops klipper, performs a git pull, installs
|
||||||
|
# possible new dependencies, then restarts klipper
|
||||||
|
#
|
||||||
function update_klipper() {
|
function update_klipper() {
|
||||||
read_kiauh_ini "${FUNCNAME[0]}"
|
read_kiauh_ini "${FUNCNAME[0]}"
|
||||||
|
|
||||||
|
local py_ver
|
||||||
local custom_repo="${custom_klipper_repo}"
|
local custom_repo="${custom_klipper_repo}"
|
||||||
local custom_branch="${custom_klipper_repo_branch}"
|
local custom_branch="${custom_klipper_repo_branch}"
|
||||||
|
|
||||||
|
py_ver="python$(get_klipper_python_ver)"
|
||||||
|
|
||||||
do_action_service "stop" "klipper"
|
do_action_service "stop" "klipper"
|
||||||
|
|
||||||
if [[ ! -d ${KLIPPER_DIR} ]]; then
|
if [[ ! -d ${KLIPPER_DIR} ]]; then
|
||||||
clone_klipper "${custom_repo}" "${custom_branch}"
|
clone_klipper "${custom_repo}" "${custom_branch}"
|
||||||
else
|
else
|
||||||
backup_before_update "klipper"
|
backup_before_update "klipper"
|
||||||
|
|
||||||
status_msg "Updating Klipper ..."
|
status_msg "Updating Klipper ..."
|
||||||
cd "${KLIPPER_DIR}" && git pull
|
cd "${KLIPPER_DIR}" && git pull
|
||||||
### read PKGLIST and install possible new dependencies
|
### read PKGLIST and install possible new dependencies
|
||||||
install_klipper_packages
|
install_klipper_packages "${py_ver}"
|
||||||
### install possible new python dependencies
|
### install possible new python dependencies
|
||||||
"${KLIPPY_ENV}"/bin/pip install -r "${KLIPPER_DIR}/scripts/klippy-requirements.txt"
|
"${KLIPPY_ENV}"/bin/pip install -r "${KLIPPER_DIR}/scripts/klippy-requirements.txt"
|
||||||
fi
|
fi
|
||||||
@@ -587,7 +606,11 @@ function get_klipper_cfg_dir() {
|
|||||||
echo "${cfg_dir}"
|
echo "${cfg_dir}"
|
||||||
}
|
}
|
||||||
|
|
||||||
### returns the major python version the klippy-env was created with
|
###
|
||||||
|
# reads the python version from the klipper virtual environment
|
||||||
|
#
|
||||||
|
# @output: writes the python major version to STDOUT
|
||||||
|
#
|
||||||
function get_klipper_python_ver() {
|
function get_klipper_python_ver() {
|
||||||
[[ ! -d ${KLIPPY_ENV} ]] && return
|
[[ ! -d ${KLIPPY_ENV} ]] && return
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user