diff --git a/installers/common.sh b/installers/common.sh index 728ceefe..a5203582 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -44,9 +44,9 @@ function config_installation() { echo "Install directory: ${raspap_dir}" echo -n "Install to Lighttpd root directory: ${webroot_dir}? [Y/n]: " if [ "$assume_yes" == 0 ]; then - read answer + read answer < /dev/tty if [ "$answer" != "${answer#[Nn]}" ]; then - read -e -p "Enter alternate Lighttpd directory: " -i "/var/www/html" webroot_dir + read -e -p < /dev/tty "Enter alternate Lighttpd directory: " -i "/var/www/html" webroot_dir fi else echo -e @@ -55,7 +55,7 @@ function config_installation() { echo -n "Complete installation with these values? [Y/n]: " if [ "$assume_yes" == 0 ]; then - read answer + read answer < /dev/tty if [ "$answer" != "${answer#[Nn]}" ]; then echo "Installation aborted." exit 0 @@ -130,7 +130,7 @@ function prompt_install_openvpn() { install_log "Setting up OpenVPN support (beta)" echo -n "Install OpenVPN and enable client configuration? [Y/n]: " if [ "$assume_yes" == 0 ]; then - read answer + read answer < /dev/tty if [ "$answer" != "${answer#[Nn]}" ]; then echo -e else @@ -264,7 +264,7 @@ function default_configuration() { # Prompt to install RaspAP daemon echo -n "Enable RaspAP control service (Recommended)? [Y/n]: " if [ "$assume_yes" == 0 ]; then - read answer + read answer < /dev/tty if [ "$answer" != "${answer#[Nn]}" ]; then echo -e else @@ -372,7 +372,7 @@ function optimize_php() { echo -n "Enable HttpOnly for session cookies (Recommended)? [Y/n]: " if [ "$assume_yes" == 0 ]; then - read answer + read answer < /dev/tty if [ "$answer" != "${answer#[Nn]}" ]; then echo -e else @@ -388,7 +388,7 @@ function optimize_php() { if [ "$php_package" = "php7.1-cgi" ]; then echo -n "Enable PHP OPCache (Recommended)? [Y/n]: " if [ "$assume_yes" == 0 ]; then - read answer + read answer < /dev/tty if [ "$answer" != "${answer#[Nn]}" ]; then echo -e else @@ -417,7 +417,7 @@ function install_complete() { # With default_configuration this will create an active AP on restart. if ip a | grep -q ': eth0:.*state UP'; then echo -n "The system needs to be rebooted as a final step. Reboot now? [y/N]: " - read answer + read answer < /dev/tty if [ "$answer" != "${answer#[Nn]}" ]; then echo "Installation reboot aborted." exit 0 diff --git a/installers/mkcert.sh b/installers/mkcert.sh index 0de09b0c..d9770876 100755 --- a/installers/mkcert.sh +++ b/installers/mkcert.sh @@ -16,9 +16,9 @@ function config_installation() { echo "Current system hostname is $HOSTNAME" echo -n "Create an SSL certificate for ${certname}? (Recommended) [y/N]" if [ $assume_yes == 0 ]; then - read answer + read answer < /dev/tty if [[ $answer != "y" ]]; then - read -e -p "Enter an alternate certificate name: " -i "${certname}" certname + read -e -p < /dev/tty "Enter an alternate certificate name: " -i "${certname}" certname fi else echo -e @@ -26,9 +26,9 @@ function config_installation() { echo -n "Install to lighttpd SSL directory: ${lighttpd_ssl}? [y/N]: " if [ $assume_yes == 0 ]; then - read answer + read answer < /dev/tty if [[ $answer != "y" ]]; then - read -e -p "Enter alternate lighttpd SSL directory: " -i "${lighttpd_ssl}" lighttpd_ssl + read -e -p < /dev/tty "Enter alternate lighttpd SSL directory: " -i "${lighttpd_ssl}" lighttpd_ssl fi else echo -e @@ -40,7 +40,7 @@ function config_installation() { install_divider echo -n "Complete installation with these values? [y/N]: " if [ $assume_yes == 0 ]; then - read answer + read answer < /dev/tty if [[ $answer != "y" ]]; then echo "Installation aborted." exit 0 @@ -125,12 +125,13 @@ function restart_lighttpd() { function install_complete() { install_log "SSL certificate install completed!" install_divider - echo "Open a browser and enter the address: http://${certname}/rootCA.pem" - echo "Download the root certificate to your client and add it to your system keychain." - echo "Note: Be sure to set this certificate to "Always trust" to avoid browser warnings." - echo "Finally, enter the address https://${certname} in your browser." - echo "Enjoy an encrypted SSL connection to RaspAP 🔒" - echo "For advanced options, run mkcert -help" + printf '%s\n' \ + "Open a browser and enter the address: http://$certname/rootCA.pem" \ + "Download the root certificate to your client and add it to your system keychain." \ + "Note: Be sure to set this certificate to 'Always trust' to avoid browser warnings." \ + "Finally, enter the address https://$certname in your browser." \ + "Enjoy an encrypted SSL connection to RaspAP 🔒" \ + "For advanced options, run mkcert -help" install_divider }