Compare commits

...

4 Commits

2 changed files with 13 additions and 5 deletions

View File

@ -84,11 +84,11 @@ fatal(){
if $terminal ; then if $terminal ; then
if [[ -n "$*" ]] ; then if [[ -n "$*" ]] ; then
echo -e " [ \033[31m\033[1mFatal\033[m ]: $*" echo -e " [ \033[31m\033[1mFatal\033[m ]: $*"
echo ""
echo -e " \033[31m\033[1mScript will be interrupted.\033[m"
else else
echo " \033[31m\033[1mFatal error\033[m:" echo -e " \033[31m\033[1mFatal error\033[m: \033[1mScript will be interrupted.\033[m"
fi fi
echo ""
echo -e " \033[31m\033[1mScript will be interrupted.\033[m\033[m"
else else
if [[ -n "$*" ]] ; then if [[ -n "$*" ]] ; then
echo " [ Fatal ]: $*" echo " [ Fatal ]: $*"
@ -156,6 +156,13 @@ echo_skipped() {
fi fi
} }
blank_line() {
if $terminal ; then
echo ""
fi
}
is_number() { is_number() {
return $(test ! -z "${1##*[!0-9]*}" > /dev/null 2>&1); return $(test ! -z "${1##*[!0-9]*}" > /dev/null 2>&1);
@ -276,6 +283,7 @@ if $NON_INTERACTIVE_MODE && [[ -z "$DATABASE_NAME" ]]; then
fi fi
blank_line
echononl " Get MySQL command.." echononl " Get MySQL command.."
mysql_command="$(which mysql)" mysql_command="$(which mysql)"
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then

View File

@ -505,7 +505,7 @@ fi
# ---------- # ----------
echononl " Read Commandline Parameter.." echononl " Read Commandline Parameter.."
while getopts bd:f:hs: opt ; do while getopts bc:d:f:hs: opt ; do
case $opt in case $opt in
b) BATCH_MODE=true b) BATCH_MODE=true
NON_INTERACTIVE_MODE=true NON_INTERACTIVE_MODE=true
@ -1072,7 +1072,7 @@ fi
echononl " Dump Database '${DATABASE_NAME}'.." echononl " Dump Database '${DATABASE_NAME}'.."
b_timestamp=$(date +"%s") b_timestamp=$(date +"%s")
if [[ -n "$DATABASE_SERVER" ]] ; then if [[ -n "$DATABASE_SERVER" ]] ; then
${mysqldump_command} -h $DATABASE_SERVER $DATABASE_CREDENTIALS_ARGS $DATABASE_NAME > ${DATABASE_DUMP_FOLDER}/${DATABASE_DUMP_FILEi} 2> $log_file ${mysqldump_command} -h $DATABASE_SERVER $DATABASE_CREDENTIALS_ARGS $DATABASE_NAME > ${DATABASE_DUMP_FOLDER}/${DATABASE_DUMP_FILE} 2> $log_file
else else
${mysqldump_command} $DATABASE_CREDENTIALS_ARGS $DATABASE_NAME > ${DATABASE_DUMP_FOLDER}/${DATABASE_DUMP_FILE} 2> $log_file ${mysqldump_command} $DATABASE_CREDENTIALS_ARGS $DATABASE_NAME > ${DATABASE_DUMP_FOLDER}/${DATABASE_DUMP_FILE} 2> $log_file
fi fi