From 98dd71ec3904458fa48585efdf4f3463dcae9cb4 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 27 Dec 2015 20:43:54 +0000 Subject: [PATCH] Added fix for auto-install Bypasses code for MariaDB/MySQL and warns users have use auto-install sqlite is being used --- functions/install_ts3db.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/functions/install_ts3db.sh b/functions/install_ts3db.sh index 82ba5a6fa..f7654ce07 100644 --- a/functions/install_ts3db.sh +++ b/functions/install_ts3db.sh @@ -41,15 +41,19 @@ fn_install_ts3db_mariadb(){ sleep 1 } -echo "" -while true; do - read -e -i "n" -p "Do you want to use MariaDB/MySQL instead of sqlite (Database Server including user and database already has to be set up!)? [y/N]" yn - case $yn in - [Yy]* ) fn_install_ts3db_mariadb && break;; - [Nn]* ) break;; - * ) echo "Please answer yes or no.";; - esac -done +if [ -z "${autoinstall}" ]; then + echo "" + while true; do + read -e -i "n" -p "Do you want to use MariaDB/MySQL instead of sqlite (Database Server including user and database already has to be set up!)? [y/N]" yn + case $yn in + [Yy]* ) fn_install_ts3db_mariadb && break;; + [Nn]* ) break;; + * ) echo "Please answer yes or no.";; + esac + done +else +fn_printwarningnl "./${selfname} auto-install is uses sqlite. For MariaDB/MySQL use ./${selfname} install" +fi ## Get privilege key echo ""