frodovdr
/
guac-install
mirror of https://github.com/MysticRyuujin/guac-install.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Switch to command -v for mysql executable check 

* Switch to `command -v` for mysql executable check

* Add the same check to Debian
This commit is contained in:
Chase Wright 2020-02-23 13:25:48 -06:00 committed by GitHub
parent 621ebc6d32
commit 87a119e372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guac-install.sh
View File

@ -200,7 +200,7 @@ if [[ "${NAME}" == "Ubuntu" ]]; then
if [ "$installMySQL" = true ]; then
MYSQL="mysql-server mysql-client mysql-common mysql-utilities"
# Checking if (any kind of) mysql-client or compatible command installed. This is useful for existing mariadb server
elif type "mysql" > /dev/null; then
elif [ -x "$(command -v mysql)" ]; then
MYSQL=""
else
MYSQL="mysql-client"
@ -214,6 +214,9 @@ elif [[ "${NAME}" == *"Debian"* ]] || [[ "${NAME}" == *"Raspbian GNU/Linux"* ]];
fi
if [ "$installMySQL" = true ]; then
MYSQL="default-mysql-server default-mysql-client mysql-common"
# Checking if (any kind of) mysql-client or compatible command installed. This is useful for existing mariadb server
elif [ -x "$(command -v mysql)" ]; then
MYSQL=""
else
MYSQL="default-mysql-client"
fi