jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-14 02:54:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix: move test_api to moonraker install routine

Browse Source
This commit is contained in:
th33xitus
2020-08-20 18:58:57 +02:00
parent db5b906e5b
commit 92b4bc41ac
2 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scripts/install_mainsail.sh
View File

@@ -6,12 +6,9 @@ install_mainsail(){
disable_octoprint_service disable_octoprint_service
fi fi
disable_haproxy_lighttpd disable_haproxy_lighttpd
#remove_haproxy_lighttpd
#beginning of mainsail installation
create_reverse_proxy "mainsail" create_reverse_proxy "mainsail"
test_api
test_nginx
mainsail_setup mainsail_setup
test_nginx
ok_msg "Mainsail installation complete!"; echo ok_msg "Mainsail installation complete!"; echo
else else
ERROR_MSG=" Please install Klipper first!\n Skipping..." ERROR_MSG=" Please install Klipper first!\n Skipping..."
@@ -39,36 +36,10 @@ disable_haproxy_lighttpd(){
done done
} }
#remove_haproxy_lighttpd(){
# rem=(haproxy lighttpd)
# for remove in "${rem[@]}"
# do
# if [[ $(dpkg-query -f'${Status}' --show $remove 2>/dev/null) = *\ installed #]]; then
# delete+=($remove)
# fi
# done
# if ! [ ${#delete[@]} -eq 0 ]; then
# sudo apt-get remove ${delete[@]} -y
# fi
#}
test_api(){
status_msg "Testing API ..."
sleep 5
status_msg "API response from http://localhost:7125/printer/info:"
API_RESPONSE=$(curl -sG4m5 http://localhost:7125/printer/info)
echo -e "${cyan}$API_RESPONSE${default}"
if [ $(curl -sG4 "http://localhost:7125/printer/info" | grep '^{"result"' -c) -eq 1 ]; then
echo; ok_msg "Klipper API is working correctly!"; echo
else
echo; warn_msg "Klipper API not working correctly!"; echo
fi
}
test_nginx(){ test_nginx(){
status_msg "Testing Nginx ..." status_msg "Testing Nginx ..."
sleep 5 sleep 5
status_msg "API response from http://localhost/printer/info:" status_msg "API response from http://localhost/printer/info :"
API_RESPONSE="$(curl -sG4m5 http://localhost/printer/info)" API_RESPONSE="$(curl -sG4m5 http://localhost/printer/info)"
echo -e "${cyan}$API_RESPONSE${default}" echo -e "${cyan}$API_RESPONSE${default}"
if [ $(curl -sG4 "http://localhost/printer/info" | grep '^{"result"' -c) -eq 1 ]; then if [ $(curl -sG4 "http://localhost/printer/info" | grep '^{"result"' -c) -eq 1 ]; then

17
scripts/install_moonraker.sh
View File

@@ -16,6 +16,7 @@ install_moonraker(){
#after install actions #after install actions
restart_moonraker restart_moonraker
restart_klipper restart_klipper
test_api
} }
system_check_moonraker(){ system_check_moonraker(){
@@ -402,4 +403,20 @@ symlink_moonraker_log(){
ln -s /tmp/moonraker.log ${HOME}/klipper_config/moonraker.log ln -s /tmp/moonraker.log ${HOME}/klipper_config/moonraker.log
ok_msg "Symlink created!" ok_msg "Symlink created!"
fi fi
}
#############################################################
#############################################################
test_api(){
status_msg "Testing API ..."
sleep 5
status_msg "API response from http://localhost:7125/printer/info :"
API_RESPONSE=$(curl -sG4m5 http://localhost:7125/printer/info)
echo -e "${cyan}$API_RESPONSE${default}"
if [ $(curl -sG4 "http://localhost:7125/printer/info" | grep '^{"result"' -c) -eq 1 ]; then
echo; ok_msg "Klipper API is working correctly!"; echo
else
echo; warn_msg "Klipper API not working correctly!"; echo
fi
} }