Make use of new way to display step arguments (echoinfoArgs)

This commit is contained in:
2022-01-16 23:40:59 +01:00
parent 1edef40342
commit feed3076ba

View File

@@ -25,7 +25,7 @@ step_2() {
exe mysql_secure_installation
}
step_3_info() { echo -e "${databaseName} configuration\n"; }
step_3_info() { echo "${databaseName} configuration"; }
step_3() {
addConf -c "$mariadbConfig" "$mariadbConfigLoc"
@@ -53,12 +53,13 @@ step_8() {
}
step_10_info() {
echo "Create mysql database without specific characterset [OPTIONS]"
echoinfoArgs "[OPTIONS]"
echo "Create mysql database without specific characterset"
echoinfo " [OPTIONS]"
echoinfo " --charset,-c <utf8|utf8mb4> : character set and collate"
echoinfo " --database, -d : database name"
echoinfo " --user, -u : user name"
echoinfo " Manual password entry for non existing user"
echoinfo " --database, -d : database name"
echoinfo " --user, -u : user name"
echoinfo " Manual password entry for non existing user"
}
step_10_alias() { ALIAS="createdb"; }
step_10() {
@@ -136,7 +137,10 @@ step_16() {
echo -e "\nDrop dbuser by: mysql -u root -e 'DROP USER dbuser@localhost;'"
}
step_18_info() { echo "Size of database [DATABASE_NAME]"; }
step_18_info() {
echoinfoArgs "[DATABASE_NAME]"
echo "Size of database"
}
step_18_alias() { ALIAS="sizedb"; }
step_18() {
if [ -z "$2" ]; then
@@ -150,7 +154,10 @@ step_18() {
fi
}
step_20_info() { echo "Backup (dump) a mysql database <DATABASE NAME> <TARGET DIR>"; }
step_20_info() {
echoinfoArgs "<DATABASE NAME> <TARGET DIR>"
echo "Backup (dump) a mysql database"
}
step_20_alias() { ALIAS="backup"; }
step_20() {
shift # step number not used
@@ -196,5 +203,5 @@ readDatabaseInfos() {
echo
}
VERSION_SEQREV=10
VERSION_SEQREV=14
. /usr/local/bin/sequencer.sh