mirror of
https://github.com/dw-0/kiauh.git
synced 2025-12-14 02:54:28 +05:00
Better tornado install check
This commit is contained in:
@@ -11,7 +11,7 @@ dwc2_install_routine(){
|
|||||||
fi
|
fi
|
||||||
stop_klipper
|
stop_klipper
|
||||||
#disable octoprint service if installed
|
#disable octoprint service if installed
|
||||||
if systemctl is-enabled octoprint.service -q &>/dev/null; then
|
if systemctl is-enabled octoprint.service -q 2>/dev/null; then
|
||||||
disable_octoprint_service
|
disable_octoprint_service
|
||||||
fi
|
fi
|
||||||
install_tornado
|
install_tornado
|
||||||
@@ -25,18 +25,15 @@ dwc2_install_routine(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
install_tornado(){
|
install_tornado(){
|
||||||
if [ ! -d $TORNADO_DIR1 ]; then
|
if [ "$(cd $KLIPPY_ENV_DIR/bin/ && $_/pip list 2>/dev/null | grep "tornado" | cut -d" " -f9)" = "5.1.1" ]; then
|
||||||
#check for dependencies
|
ok_msg "Tornado 5.1.1 is already installed! Continue..."
|
||||||
dep=(virtualenv)
|
else
|
||||||
dep_check
|
|
||||||
#execute operation
|
|
||||||
status_msg "Installing Tornado 5.1.1 ..."
|
status_msg "Installing Tornado 5.1.1 ..."
|
||||||
cd ${HOME}
|
cd ${HOME}
|
||||||
PYTHONDIR="${HOME}/klippy-env"
|
PYTHONDIR="${HOME}/klippy-env"
|
||||||
virtualenv ${PYTHONDIR}
|
virtualenv ${PYTHONDIR}
|
||||||
${PYTHONDIR}/bin/pip install tornado==5.1.1 && ok_msg "Tornado 5.1.1 successfully installed!"
|
${PYTHONDIR}/bin/pip install tornado==5.1.1
|
||||||
else
|
ok_msg "Tornado 5.1.1 successfully installed!"
|
||||||
ok_msg "Looks like Tornado 5.1.1 is already installed! Continue..."
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user