diff --git a/apps/additional_apps.sh b/apps/additional_apps.sh index a8cf31d4..cffdc745 100644 --- a/apps/additional_apps.sh +++ b/apps/additional_apps.sh @@ -30,9 +30,8 @@ whiptail --title "Which apps do you want to install?" --checklist --separate-out "Talk" "(Nextcloud Video calls and chat) " OFF \ "SMB-mount" "(Connect to SMB-shares from your local network) " OFF 2>results -while read -r -u 11 choice -do - case $choice in +choice=$(< results) + case "$choice" in Fail2ban) clear run_app_script fail2ban @@ -92,11 +91,10 @@ do clear run_app_script smbmount ;; - + *) ;; esac -done 11< results rm -f results clear diff --git a/apps/previewgenerator.sh b/apps/previewgenerator.sh index a39bf7c9..a862bf79 100644 --- a/apps/previewgenerator.sh +++ b/apps/previewgenerator.sh @@ -109,9 +109,8 @@ then "SVG" "" ON \ "TIFF" "" ON 2>results - while read -r -u 11 choice - do - case $choice in + choice=$(< results) + case "$choice" in "PNG") occ_command config:system:set enabledPreviewProviders 0 --value="OC\\Preview\\PNG" ;; @@ -159,7 +158,6 @@ then *) ;; esac - done 11< results rm -f results else # check if imagick ist installed and remove it @@ -184,9 +182,8 @@ else "TXT" "" ON \ "Movie" "" ON 2>results - while read -r -u 8 choice - do - case $choice in + choice=$(< results) + case "$choice" in "PNG") occ_command config:system:set enabledPreviewProviders 11 --value="OC\\Preview\\PNG" ;; @@ -222,7 +219,6 @@ else *) ;; esac - done 8< results rm -f results fi diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh index 31c732af..71cd481e 100644 --- a/nextcloud-startup-script.sh +++ b/nextcloud-startup-script.sh @@ -380,14 +380,13 @@ whiptail --title "Extra configurations" --checklist --separate-output "Choose wh "Automatic updates" "(Automatically update your server every week on Sundays)" OFF \ "CookieLifetime" "(Configure forced logout timeout for users using the web GUI)" OFF 2>results -while read -r -u 9 choice -do - case $choice in +choice=$(< results) + case "$choice" in "Security") clear run_static_script security ;; - + "Static IP") clear run_static_script static_ip @@ -398,7 +397,7 @@ do clear run_static_script automatic_updates ;; - + CookieLifetime) clear run_static_script cookielifetime @@ -407,7 +406,6 @@ do *) ;; esac -done 9< results rm -f results # Let's Encrypt