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

Fix bugs

Browse Source
This commit is contained in:
th33xitus
2020-07-16 17:01:57 +02:00
parent d19c4d33cb
commit 1cc94d4874
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/functions.sh
View File

@@ -219,13 +219,17 @@ flash_mcu(){
}
enable_octoprint_service(){
status_msg "OctoPrint Service is disabled! Enabling now ..."
sudo systemctl enable octoprint -q && sudo systemctl start octoprint
if [[ -f $OCTOPRINT_SERVICE1 && -f $OCTOPRINT_SERVICE2 ]]; then
status_msg "OctoPrint Service is disabled! Enabling now ..."
sudo systemctl enable octoprint -q && sudo systemctl start octoprint
fi
}
disable_octoprint_service(){
status_msg "OctoPrint Service is enabled! Disabling now ..."
sudo systemctl stop octoprint && sudo systemctl disable octoprint -q
if [[ -f $OCTOPRINT_SERVICE1 && -f $OCTOPRINT_SERVICE2 ]]; then
status_msg "OctoPrint Service is enabled! Disabling now ..."
sudo systemctl stop octoprint && sudo systemctl disable octoprint -q
fi
}
toggle_octoprint_service(){
@@ -245,7 +249,7 @@ toggle_octoprint_service(){
}
read_octoprint_service_status(){
if ! systemctl is-enabled octoprint.service -q; then
if ! systemctl is-enabled octoprint.service -q &>/dev/null; then
OPRINT_SERVICE_STATUS="${green}[Enable]${default} OctoPrint Service "
else
OPRINT_SERVICE_STATUS="${red}[Disable]${default} OctoPrint Service "

9
scripts/install_mainsail.sh
View File

@@ -5,13 +5,11 @@ mainsail_install_routine(){
dep_check
#execute operation
#disable octoprint service if installed
if systemctl is-enabled octoprint.service -q; then
disable_octoprint_service
fi
disable_octoprint_service
disable_wrong_webserver
remove_wrong_webserver
install_moonraker
if [ $ERROR != 1 ]; then
if [ "$ERROR" != 1 ]; then
check_printer_cfg
restart_moonraker
restart_klipper
@@ -203,7 +201,8 @@ config_nginx_mainsail(){
mkdir $MAINSAIL_DIR
fi
status_msg "Create Nginx configuration ..."
sudo cat ${HOME}/kiauh/resources/mainsail_nginx.cfg > /etc/nginx/sites-available/mainsail
cat ${HOME}/kiauh/resources/mainsail_nginx.cfg > ${HOME}/kiauh/resources/mainsail
sudo mv ${HOME}/kiauh/resources/mainsail /etc/nginx/sites-available/mainsail
if [ -e /etc/nginx/sites-enabled/default ]; then
sudo rm /etc/nginx/sites-enabled/default
fi