This commit is contained in:
th33xitus
2020-07-22 17:50:46 +02:00
parent 3091ce55ad
commit 108b5c7b0c
2 changed files with 15 additions and 11 deletions

View File

@@ -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; then if systemctl is-enabled octoprint.service -q &>/dev/null; then
disable_octoprint_service disable_octoprint_service
fi fi
install_tornado install_tornado
@@ -25,15 +25,19 @@ dwc2_install_routine(){
} }
install_tornado(){ install_tornado(){
#check for dependencies if [ ! -d $TORNADO_DIR1 ]; then
dep=(virtualenv) #check for dependencies
dep_check dep=(virtualenv)
#execute operation dep_check
status_msg "Installing Tornado 5.1.1 ..." #execute operation
cd ${HOME} status_msg "Installing Tornado 5.1.1 ..."
PYTHONDIR="${HOME}/klippy-env" cd ${HOME}
virtualenv ${PYTHONDIR} PYTHONDIR="${HOME}/klippy-env"
${PYTHONDIR}/bin/pip install tornado==5.1.1 && ok_msg "Tornado 5.1.1 successfully installed!" virtualenv ${PYTHONDIR}
${PYTHONDIR}/bin/pip install tornado==5.1.1 && ok_msg "Tornado 5.1.1 successfully installed!"
else
ok_msg "Looks like Tornado 5.1.1 is already installed! Continue..."
fi
} }
install_dwc2fk(){ install_dwc2fk(){

View File

@@ -24,7 +24,7 @@ octoprint_dependencies(){
status_msg "Checking for dependencies ..." status_msg "Checking for dependencies ..."
for octo_dep_pgk in "${octo_dep[@]}" for octo_dep_pgk in "${octo_dep[@]}"
do do
if [[ $(dpkg-query -f'${Status}' --show $octo_dep_pgk 2>/dev/null) = *\ installed ]]; then if [[ ! $(dpkg-query -f'${Status}' --show $octo_dep_pgk 2>/dev/null) = *\ installed ]]; then
install+=($octo_dep_pgk) install+=($octo_dep_pgk)
fi fi
done done