Эх сурвалжийг харах

mysqladmin got renamed on MariaDB systems to mariadb-admin (#4850)

* mysqladmin got renamed on MariaDB systems to mariadb-admin

* Use correct path
Jaap Marcus 1 жил өмнө
parent
commit
1263188b72

+ 11 - 4
bin/v-list-sys-db-status

@@ -61,10 +61,17 @@ for db in $(echo $DB_SYSTEM | tr ',' '\n'); do
 						chmod 660 $mycnf
 						chmod 660 $mycnf
 					fi
 					fi
 				fi
 				fi
-				echo "MySQL $HOST status"
-				mysqladmin --defaults-file=$mycnf status | sed -e "s/  /\n/g"
-				echo
-				mysqladmin --defaults-file=$mycnf processlist
+				if [ -f '/usr/bin/mariadb-admin' ]; then
+					echo "MySQL $HOST status"
+					mariadb-admin --defaults-file=$mycnf status | sed -e "s/  /\n/g"
+					echo
+					mariadb-admin --defaults-file=$mycnf processlist
+				else
+					echo "MySQL $HOST status"
+					mysqladmin --defaults-file=$mycnf status | sed -e "s/  /\n/g"
+					echo
+					mysqladmin --defaults-file=$mycnf processlist
+				fi
 				echo -en "\n---------------------------------------------"
 				echo -en "\n---------------------------------------------"
 				echo -en "---------------------------------------------\n\n"
 				echo -en "---------------------------------------------\n\n"
 			fi
 			fi