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

fix: bring octoprint installation routine into line with dwc2 and mainsail/moonraker routines

Browse Source
This commit is contained in:
th33xitus
2020-08-22 19:30:35 +02:00
parent 5392e2a9ab
commit 09e4c7bea5
2 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kiauh.sh
View File

@@ -190,7 +190,7 @@ install_menu(){
5) 5)
clear clear
print_header print_header
octoprint_install_routine install_octoprint
print_msg && clear_msg print_msg && clear_msg
install_ui;; install_ui;;
Q|q) Q|q)

42
scripts/install_octoprint.sh
View File

@@ -1,13 +1,29 @@
octoprint_install_routine(){ install_octoprint(){
#ask user for customization
get_user_selections_octoprint
#octoprint main installation
octoprint_dependencies octoprint_dependencies
install_octoprint octoprint_setup
add_groups add_groups
configure_autostart configure_autostart
add_reboot_permission add_reboot_permission
octoprint_reverse_proxy_dialog
create_custom_hostname
create_config_yaml create_config_yaml
load_server #execute customizations
create_reverse_proxy "octoprint"
set_hostname
#after install actions
load_octoprint_server
}
get_user_selections_octoprint(){
status_msg "Initializing OctoPrint installation ..."
#ask user to set a reverse proxy
octoprint_reverse_proxy_dialog
#ask to change hostname
if [ "$SET_REVERSE_PROXY" = "true" ]; then
create_custom_hostname
fi
status_msg "Installation will start now! Please wait ..."
} }
octoprint_dependencies(){ octoprint_dependencies(){
@@ -24,7 +40,7 @@ octoprint_dependencies(){
dependency_check dependency_check
} }
install_octoprint(){ octoprint_setup(){
if [ ! -d $OCTOPRINT_DIR ];then if [ ! -d $OCTOPRINT_DIR ];then
status_msg "Create OctoPrint directory ..." status_msg "Create OctoPrint directory ..."
mkdir -p $OCTOPRINT_DIR && ok_msg "Directory created!" mkdir -p $OCTOPRINT_DIR && ok_msg "Directory created!"
@@ -97,6 +113,8 @@ add_reboot_permission(){
} }
octoprint_reverse_proxy_dialog(){ octoprint_reverse_proxy_dialog(){
unset SET_REVERSE_PROXY
echo
top_border top_border
echo -e "| If you want to have nicer URLs or simply need | " echo -e "| If you want to have nicer URLs or simply need | "
echo -e "| OctoPrint to run on port 80 (http's default port) | " echo -e "| OctoPrint to run on port 80 (http's default port) | "
@@ -106,11 +124,15 @@ octoprint_reverse_proxy_dialog(){
bottom_border bottom_border
while true; do while true; do
echo -e "${cyan}" echo -e "${cyan}"
read -p "###### Do you want to set up a reverse proxy now? (Y/n): " yn read -p "###### Do you want to set up a reverse proxy now? (y/N): " yn
echo -e "${default}" echo -e "${default}"
case "$yn" in case "$yn" in
Y|y|Yes|yes|"") create_reverse_proxy "octoprint"; break;; Y|y|Yes|yes)
N|n|No|no) break;; SET_REVERSE_PROXY="true"
break;;
N|n|No|no|"")
SET_REVERSE_PROXY="false"
break;;
esac esac
done done
} }
@@ -124,7 +146,7 @@ create_config_yaml(){
fi fi
} }
load_server(){ load_octoprint_server(){
start_octoprint start_octoprint
#create an octoprint.log symlink in home-dir just for convenience #create an octoprint.log symlink in home-dir just for convenience
if [ ! -e ${HOME}/octoprint.log ]; then if [ ! -e ${HOME}/octoprint.log ]; then