h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

fix: issue with script aborting during match_nginx_configs

Browse Source 
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-05-28 15:56:21 +02:00
parent 8004f11150
commit 83145c1a26
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/mainsail.sh
View File

@@ -253,6 +253,7 @@ function update_mainsail() {
download_mainsail download_mainsail
match_nginx_configs match_nginx_configs
symlink_webui_nginx_log "mainsail" symlink_webui_nginx_log "mainsail"
print_confirm "Mainsail successfully updated!"
} }
#===================================================# #===================================================#

9
scripts/nginx.sh
View File

@@ -113,7 +113,6 @@ function match_nginx_configs() {
set_upstream_nginx_cfg set_upstream_nginx_cfg
require_service_restart="true" require_service_restart="true"
ok_msg "Done!"
fi fi
### check for outdated mainsail config ### check for outdated mainsail config
@@ -128,7 +127,6 @@ function match_nginx_configs() {
sudo sed -i "s/listen\s\[\:*\]\:[0-9]*;/listen \[::\]\:${mainsail_port};/" "${mainsail_nginx_cfg}" sudo sed -i "s/listen\s\[\:*\]\:[0-9]*;/listen \[::\]\:${mainsail_port};/" "${mainsail_nginx_cfg}"
require_service_restart="true" require_service_restart="true"
ok_msg "Done!"
fi fi
### check for outdated fluidd config ### check for outdated fluidd config
@@ -143,11 +141,14 @@ function match_nginx_configs() {
sudo sed -i "s/listen\s\[\:*\]\:[0-9]*;/listen \[::\]\:${fluidd_port};/" "${fluidd_nginx_cfg}" sudo sed -i "s/listen\s\[\:*\]\:[0-9]*;/listen \[::\]\:${fluidd_port};/" "${fluidd_nginx_cfg}"
require_service_restart="true" require_service_restart="true"
ok_msg "Done!"
fi fi
### only restart nginx if configs were updated ### only restart nginx if configs were updated
[[ ${require_service_restart} == "true" ]] && sudo systemctl restart nginx.service if [[ ${require_service_restart} == "true" ]]; then
sudo systemctl restart nginx.service
fi
ok_msg "Done!"
} }
function remove_conflicting_packages() { function remove_conflicting_packages() {