Skip to content

Commit 0b88c34

Browse files
KekosKekos
committed
Copied changes from arteria/automysqlbackup@d94d1a2
* Removes support for dumping flush logs. * Changes default for "usessl" config from "yes" to "no" and adds support for SSL options in MySQL 5.6 and higher. * Added support for "login paths" https://dev.mysql.com/doc/refman/5.6/en/option-file-options.html#option_general_login-path instead of setting password in config file. * Fixes "du" and "sed" commands failing in MacOS. * Also dump events to backup. * Removes some debug print statements.
1 parent d7bddce commit 0b88c34

File tree

2 files changed

+98
-56
lines changed

2 files changed

+98
-56
lines changed

‎automysqlbackup‎

Lines changed: 87 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ load_default_config() {
6565
CONFIG_rotation_weekly=35
6666
CONFIG_rotation_monthly=150
6767
CONFIG_mysql_dump_port=3306
68-
CONFIG_mysql_dump_usessl='yes'
68+
CONFIG_mysql_dump_usessl='no'
6969
CONFIG_mysql_dump_username='root'
7070
CONFIG_mysql_dump_password=''
7171
CONFIG_mysql_dump_host='localhost'
@@ -81,9 +81,11 @@ load_default_config() {
8181
CONFIG_mysql_dump_single_transaction='no'
8282
CONFIG_mysql_dump_master_data=
8383
CONFIG_mysql_dump_full_schema='yes'
84-
CONFIG_mysql_dump_flush_logs='no'
8584
CONFIG_mysql_dump_dbstatus='yes'
8685
CONFIG_mysql_dump_differential='no'
86+
CONFIG_mysql_dump_login_path='automysqldump'
87+
CONFIG_mysql_dump_login_path_file=''
88+
CONFIG_mysql_dump_encrypted_login='no'
8789
CONFIG_backup_local_files=()
8890
CONFIG_db_names=()
8991
CONFIG_db_month_names=()
@@ -98,6 +100,32 @@ load_default_config() {
98100
CONFIG_encrypt_password='password0123'
99101
}
100102

103+
# OS dependent options (showstoppers on MacOS)
104+
if [[ $OSTYPE == darwin* ]]; then
105+
OS_sed_option='-E'
106+
OS_du_extra_option=''
107+
else
108+
OS_sed_option='-r'
109+
OS_du_extra_option='--si'
110+
fi
111+
112+
mysql_commands() {
113+
VERSION=`mysql -V | grep -oE "[0-9]+\.[0-9]+\.[0-9]+"`
114+
NODOT_VER=`echo $VERSION | sed $OS_sed_option 's/\.//g'`
115+
if [ "${CONFIG_mysql_dump_encrypted_login}" = "yes" ]; then
116+
export MYSQLDUMP="mysqldump --login-path=$CONFIG_mysql_dump_login_path"
117+
export MYSQLSHOW="mysqlshow --login-path=$CONFIG_mysql_dump_login_path"
118+
export MYSQL="mysql --login-path=$CONFIG_mysql_dump_login_path"
119+
if [ -n "${CONFIG_mysql_dump_login_path_file}" ]; then
120+
export MYSQL_TEST_LOGIN_FILE=$CONFIG_mysql_dump_login_path_file
121+
fi
122+
else
123+
export MYSQLDUMP="mysqldump --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host}";
124+
export MYSQLSHOW="mysqlshow --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host}";
125+
export MYSQL="mysql --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host}";
126+
fi
127+
}
128+
101129
# @return: true, if variable is set; else false
102130
isSet() {
103131
if [[ ! ${!1} && ${!1-_} ]]; then return 1; else return 0; fi
@@ -438,7 +466,7 @@ backup_local_files () {
438466
# @deps: load_default_config
439467
parse_configuration () {
440468
# OPT string for use with mysqldump ( see man mysqldump )
441-
opt=( '--quote-names' '--opt' )
469+
opt=( '--quote-names' '--opt' '--events' )
442470

443471
# OPT string for use with mysql (see man mysql )
444472
mysql_opt=()
@@ -449,21 +477,26 @@ parse_configuration () {
449477
# OPT string for use with mysqlstatus
450478
opt_dbstatus=( '--status' )
451479

452-
[[ "${CONFIG_mysql_dump_usessl}" = "yes" ]] && {
453-
opt=( "${opt[@]}" '--ssl' )
454-
mysql_opt=( "${mysql_opt[@]}" '--ssl' )
455-
opt_fullschema=( "${opt_fullschema[@]}" '--ssl' )
456-
opt_dbstatus=( "${opt_dbstatus[@]}" '--ssl' )
457-
}
480+
if [ "$NODOT_VER" -ge 56 ]; then
481+
[[ "${CONFIG_mysql_dump_usessl}" = "yes" ]] && {
482+
opt=( "${opt[@]}" '--ssl-mode=REQUIRED' )
483+
mysql_opt=( "${mysql_opt[@]}" '--ssl-mode=REQUIRED' )
484+
opt_fullschema=( "${opt_fullschema[@]}" '--ssl-mode=REQUIRED' )
485+
opt_dbstatus=( "${opt_dbstatus[@]}" '--ssl-mode=REQUIRED' )
486+
}
487+
else
488+
[[ "${CONFIG_mysql_dump_usessl}" = "yes" ]] && {
489+
opt=( "${opt[@]}" '--ssl' )
490+
mysql_opt=( "${mysql_opt[@]}" '--ssl' )
491+
opt_fullschema=( "${opt_fullschema[@]}" '--ssl' )
492+
opt_dbstatus=( "${opt_dbstatus[@]}" '--ssl' )
493+
}
494+
fi
458495
[[ "${CONFIG_mysql_dump_master_data}" ]] && (( ${CONFIG_mysql_dump_master_data} == 1 || ${CONFIG_mysql_dump_master_data} == 2 )) && { opt=( "${opt[@]}" "--master-data=${CONFIG_mysql_dump_master_data}" );}
459496
[[ "${CONFIG_mysql_dump_single_transaction}" = "yes" ]] && {
460497
opt=( "${opt[@]}" '--single-transaction' )
461498
opt_fullschema=( "${opt_fullschema[@]}" '--single-transaction' )
462499
}
463-
[[ "${CONFIG_mysql_dump_flush_logs}" = "yes" ]] && {
464-
opt=( "${opt[@]}" '--flush-logs' )
465-
}
466-
467500
[[ "${CONFIG_mysql_dump_commcomp}" = "yes" ]] && {
468501
opt=( "${opt[@]}" '--compress' )
469502
opt_fullschema=( "${opt_fullschema[@]}" '--compress' )
@@ -519,7 +552,7 @@ parse_configuration () {
519552
db=${i%.*}
520553
table=${i#"$db".}
521554
r='\*'; [[ "$i" =~ $r ]] || { tmp[z++]="$i"; continue; }
522-
while read -r; do tmp[z++]="${db}.${REPLY}"; done < <(mysql --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${mysql_opt[@]}" --batch --skip-column-names -e "select table_name from information_schema.tables where table_schema='${db}' and table_name like '${table//\*/%}';")
555+
while read -r; do tmp[z++]="${db}.${REPLY}"; done < <($MYSQL "${mysql_opt[@]}" --batch --skip-column-names -e "select table_name from information_schema.tables where table_schema='${db}' and table_name like '${table//\*/%}';")
523556
done
524557
for l in "${tmp[@]}"; do echo "exclude $l";done
525558
CONFIG_table_exclude=("${tmp[@]}")
@@ -540,28 +573,28 @@ dbstatus() {
540573
if (( $CONFIG_dryrun )); then
541574
case "${CONFIG_mysql_dump_compression}" in
542575
'gzip')
543-
echo "dry-running: mysqlshow --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host} ${opt_dbstatus[@]} | gzip_compression > ${1}${suffix}";
576+
echo "dry-running: $MYSQLSHOW ${opt_dbstatus[@]} | gzip_compression > ${1}${suffix}";
544577
;;
545578
'bzip2')
546-
echo "dry-running: mysqlshow --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host} ${opt_dbstatus[@]} | bzip2_compression > ${1}${suffix}";
579+
echo "dry-running: $MYSQLSHOW ${opt_dbstatus[@]} | bzip2_compression > ${1}${suffix}";
547580
;;
548581
*)
549-
echo "dry-running: mysqlshow --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host} ${opt_dbstatus[@]} > ${1}${suffix}";
582+
echo "dry-running: $MYSQLSHOW ${opt_dbstatus[@]} > ${1}${suffix}";
550583
;;
551584
esac
552585
return 0;
553586
else
554587
case "${CONFIG_mysql_dump_compression}" in
555588
'gzip')
556-
mysqlshow --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt_dbstatus[@]}" | gzip_compression > "${1}${suffix}";
589+
$MYSQLSHOW "${opt_dbstatus[@]}" | gzip_compression > "${1}${suffix}";
557590
return $?
558591
;;
559592
'bzip2')
560-
mysqlshow --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt_dbstatus[@]}" | bzip2_compression > "${1}${suffix}";
593+
$MYSQLSHOW "${opt_dbstatus[@]}" | bzip2_compression > "${1}${suffix}";
561594
return $?
562595
;;
563596
*)
564-
mysqlshow --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt_dbstatus[@]}" > "${1}${suffix}";
597+
$MYSQLSHOW "${opt_dbstatus[@]}" > "${1}${suffix}";
565598
return $?
566599
;;
567600
esac
@@ -576,28 +609,28 @@ fullschema () {
576609
if (( $CONFIG_dryrun )); then
577610
case "${CONFIG_mysql_dump_compression}" in
578611
'gzip')
579-
echo "dry-running: mysqldump --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host} ${opt_fullschema[@]} | gzip_compression > ${1}${suffix}";
612+
echo "dry-running: $MYSQLDUMP ${opt_fullschema[@]} | gzip_compression > ${1}${suffix}";
580613
;;
581614
'bzip2')
582-
echo "dry-running: mysqldump --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host} ${opt_fullschema[@]} | bzip2_compression > ${1}${suffix}";
615+
echo "dry-running: $MYSQLDUMP ${opt_fullschema[@]} | bzip2_compression > ${1}${suffix}";
583616
;;
584617
*)
585-
echo "dry-running: mysqldump --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host} ${opt_fullschema[@]} > ${1}${suffix}";
618+
echo "dry-running: $MYSQLDUMP ${opt_fullschema[@]} > ${1}${suffix}";
586619
;;
587620
esac
588621
return 0;
589622
else
590623
case "${CONFIG_mysql_dump_compression}" in
591624
'gzip')
592-
mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt_fullschema[@]}" | gzip_compression > "${1}${suffix}";
625+
$MYSQLDUMP "${opt_fullschema[@]}" | gzip_compression > "${1}${suffix}";
593626
return $?
594627
;;
595628
'bzip2')
596-
mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt_fullschema[@]}" | bzip2_compression > "${1}${suffix}";
629+
$MYSQLDUMP "${opt_fullschema[@]}" | bzip2_compression > "${1}${suffix}";
597630
return $?
598631
;;
599632
*)
600-
mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt_fullschema[@]}" > "${1}${suffix}";
633+
$MYSQLDUMP "${opt_fullschema[@]}" > "${1}${suffix}";
601634
return $?
602635
;;
603636
esac
@@ -715,13 +748,13 @@ process_dbs() {
715748
uid="${uid:-8:8}"
716749
case "${CONFIG_mysql_dump_compression}" in
717750
'gzip')
718-
mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@" | gzip_compression > "$cfname";
751+
$MYSQLDUMP "${opt[@]}" "$@" | gzip_compression > "$cfname";
719752
;;
720753
'bzip2')
721-
mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@" | bzip2_compression > "$cfname";
754+
$MYSQLDUMP "${opt[@]}" "$@" | bzip2_compression > "$cfname";
722755
;;
723756
*)
724-
mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@" > "$cfname";
757+
$MYSQLDUMP "${opt[@]}" "$@" > "$cfname";
725758
;;
726759
esac
727760
add_manifest_entry "$manifest_file" "$cfname" "$pid" "$db" && parse_manifest "$manifest_file" && cp -al "$cfname" "${CONFIG_backup_dir}"/latest/ && echo "Generated master backup $cfname" && return 0 || return 1
@@ -734,29 +767,29 @@ process_dbs() {
734767
case "${CONFIG_mysql_dump_compression}" in
735768
'gzip')
736769
if (( $filename_flags & $filename_flag_gz )); then
737-
diff <(gzip_compression -dc "${manifest_latest_master_entry[0]}") <(mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@") | gzip_compression > "$cfname";
770+
diff <(gzip_compression -dc "${manifest_latest_master_entry[0]}") <($MYSQLDUMP "${opt[@]}" "$@") | gzip_compression > "$cfname";
738771
elif (( $filename_flags & $filename_flag_bz2 )); then
739-
diff <(bzip2_compression -dc "${manifest_latest_master_entry[0]}") <(mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@") | gzip_compression > "$cfname";
772+
diff <(bzip2_compression -dc "${manifest_latest_master_entry[0]}") <($MYSQLDUMP "${opt[@]}" "$@") | gzip_compression > "$cfname";
740773
else
741-
diff "${manifest_latest_master_entry[0]}" <(mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@") | gzip_compression > "$cfname";
774+
diff "${manifest_latest_master_entry[0]}" <($MYSQLDUMP "${opt[@]}" "$@") | gzip_compression > "$cfname";
742775
fi
743776
;;
744777
'bzip2')
745778
if (( $filename_flags & $filename_flag_gz )); then
746-
diff <(gzip_compression -dc "${manifest_latest_master_entry[0]}") <(mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@") | bzip2_compression > "$cfname";
779+
diff <(gzip_compression -dc "${manifest_latest_master_entry[0]}") <($MYSQLDUMP "${opt[@]}" "$@") | bzip2_compression > "$cfname";
747780
elif (( $filename_flags & $filename_flag_bz2 )); then
748-
diff <(bzip2_compression -dc "${manifest_latest_master_entry[0]}") <(mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@") | bzip2_compression > "$cfname";
781+
diff <(bzip2_compression -dc "${manifest_latest_master_entry[0]}") <($MYSQLDUMP "${opt[@]}" "$@") | bzip2_compression > "$cfname";
749782
else
750-
diff "${manifest_latest_master_entry[0]}" <(mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@") | bzip2_compression > "$cfname";
783+
diff "${manifest_latest_master_entry[0]}" <($MYSQLDUMP "${opt[@]}" "$@") | bzip2_compression > "$cfname";
751784
fi
752785
;;
753786
*)
754787
if (( $filename_flags & $filename_flag_gz )); then
755-
diff <(gzip_compression -dc "${manifest_latest_master_entry[0]}") <(mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@") > "$cfname";
788+
diff <(gzip_compression -dc "${manifest_latest_master_entry[0]}") <($MYSQLDUMP "${opt[@]}" "$@") > "$cfname";
756789
elif (( $filename_flags & $filename_flag_bz2 )); then
757-
diff <(bzip2_compression -dc "${manifest_latest_master_entry[0]}") <(mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@") > "$cfname";
790+
diff <(bzip2_compression -dc "${manifest_latest_master_entry[0]}") <($MYSQLDUMP "${opt[@]}" "$@") > "$cfname";
758791
else
759-
diff "${manifest_latest_master_entry[0]}" <(mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@") > "$cfname";
792+
diff "${manifest_latest_master_entry[0]}" <($MYSQLDUMP "${opt[@]}" "$@") > "$cfname";
760793
fi
761794
;;
762795
esac
@@ -770,28 +803,28 @@ process_dbs() {
770803
if (( $CONFIG_dryrun )); then
771804
case "${CONFIG_mysql_dump_compression}" in
772805
'gzip')
773-
echo "dry-running: mysqldump --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host} ${opt[@]} $@ | gzip_compression > ${cfname}"
806+
echo "dry-running: $MYSQLDUMP ${opt[@]} $@ | gzip_compression > ${cfname}"
774807
;;
775808
'bzip2')
776-
echo "dry-running: mysqldump --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host} ${opt[@]} $@ | bzip2_compression > ${cfname}"
809+
echo "dry-running: $MYSQLDUMP ${opt[@]} $@ | bzip2_compression > ${cfname}"
777810
;;
778811
*)
779-
echo "dry-running: mysqldump --user=${CONFIG_mysql_dump_username} --password=${CONFIG_mysql_dump_password} --host=${CONFIG_mysql_dump_host} ${opt[@]} $@ > ${cfname}"
812+
echo "dry-running: $MYSQLDUMP ${opt[@]} $@ > ${cfname}"
780813
;;
781814
esac
782815
return 0;
783816
else
784817
case "${CONFIG_mysql_dump_compression}" in
785818
'gzip')
786-
mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@" | gzip_compression > "${cfname}"
819+
$MYSQLDUMP "${opt[@]}" "$@" | gzip_compression > "${cfname}"
787820
ret=$?
788821
;;
789822
'bzip2')
790-
mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@" | bzip2_compression > "${cfname}"
823+
$MYSQLDUMP "${opt[@]}" "$@" | bzip2_compression > "${cfname}"
791824
ret=$?
792825
;;
793826
*)
794-
mysqldump --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${opt[@]}" "$@" > "${cfname}"
827+
$MYSQLDUMP "${opt[@]}" "$@" > "${cfname}"
795828
ret=$?
796829
;;
797830
esac
@@ -855,7 +888,6 @@ directory_checks_enable_logging () {
855888
[[ "${CONFIG_mysql_dump_dbstatus}" = 'yes' ]] && { checkdirs=( "${checkdirs[@]}" "${CONFIG_backup_dir}/status" ); }
856889

857890
tmp_permcheck=0
858-
printf '# Checking for permissions to write to folders:\n'
859891

860892

861893
# "dirname ${CONFIG_backup_dir}" exists?
@@ -878,14 +910,9 @@ directory_checks_enable_logging () {
878910

879911

880912
# -> check base folder
881-
printf 'base folder %s ... ' "$(dirname "${CONFIG_backup_dir}")"
882913
if [[ -d "$(dirname "${CONFIG_backup_dir}")" ]]; then
883914

884-
printf 'exists ... ok.\n'
885-
printf 'backup folder %s ... ' "${CONFIG_backup_dir}"
886-
887915
if [[ -d "${CONFIG_backup_dir}" ]]; then
888-
printf 'exists ... writable? '
889916
if (( $CONFIG_dryrun )); then
890917
printf 'dry-running. Skipping. Logging to /tmp\n'
891918
log_file="/tmp/${CONFIG_mysql_dump_host}-`date +%N`.log"
@@ -894,7 +921,6 @@ directory_checks_enable_logging () {
894921
tmp_permcheck=1
895922
else
896923
if chk_folder_writable "${CONFIG_backup_dir}"; then
897-
printf 'yes. Proceeding.\n'
898924
log_file="${CONFIG_backup_dir}/${CONFIG_mysql_dump_host}-`date +%N`.log"
899925
log_errfile="${CONFIG_backup_dir}/ERRORS_${CONFIG_mysql_dump_host}-`date +%N`.log"
900926
activateIO "$log_file" "$log_errfile"
@@ -1068,7 +1094,7 @@ parse_databases() {
10681094
printf "# Parsing databases ... "
10691095
# bash 3.0
10701096
local i;i=0;
1071-
while read -r; do alldbnames[i++]="$REPLY"; done < <(mysql --user="${CONFIG_mysql_dump_username}" --password="${CONFIG_mysql_dump_password}" --host="${CONFIG_mysql_dump_host}" "${mysql_opt[@]}" --batch --skip-column-names -e "show databases")
1097+
while read -r; do alldbnames[i++]="$REPLY"; done < <($MYSQL "${mysql_opt[@]}" --batch --skip-column-names -e "show databases")
10721098
unset i
10731099

10741100
# mkfifo foo || exit; trap 'rm -f foo' EXIT
@@ -1648,9 +1674,12 @@ method_backup () {
16481674
load_default_config
16491675
16501676
trap mail_cleanup EXIT SIGHUP SIGINT SIGQUIT SIGTERM
1651-
if [[ -r "${CONFIG_configfile}" ]]; then source "${CONFIG_configfile}"; echo "Parsed config file \"${CONFIG_configfile}\""; else let "N |= $N_config_file_missing"; fi; echo
1677+
if [[ -r "${CONFIG_configfile}" ]]; then source "${CONFIG_configfile}"; else let "N |= $N_config_file_missing"; fi
16521678
if (( $opt_flag_config_file )); then if [[ -r "${opt_config_file}" ]]; then source "${opt_config_file}"; let "N |= $N_arg_conffile_parsed"; else let "N |= $N_arg_conffile_unreadable"; fi; else let "N |= $N_too_many_args"; fi
16531679
1680+
# load mysql commands
1681+
mysql_commands
1682+
16541683
(( $CONFIG_dryrun )) && {
16551684
echo "NOTE: We are dry-running. That means, that the script just shows you what it would do, if it were operating normally."
16561685
echo "THE PRINTED COMMANDS CAN'T BE COPIED AND EXECUTED IF THERE ARE SPECIAL CHARACTERS, SPACES, ETC. IN THERE THAT WOULD NEED TO BE PROPERLY QUOTED IN ORDER TO WORK. THESE WERE CORRECTLY QUOTED FOR THE OUTPUT COMMAND, BUT CAN'T BE SEEN NOW."
@@ -1974,7 +2003,7 @@ method_backup () {
19742003
# -> finished information
19752004
echo "Total disk space used for backup storage..."
19762005
echo "Size - Location"
1977-
echo `du -hsH "${CONFIG_backup_dir}"`
2006+
echo `du -hs $OS_du_extra_option "${CONFIG_backup_dir}"`
19782007
echo
19792008
echo "======================================================================"
19802009
# <- finished information
@@ -2018,6 +2047,9 @@ method_list_manifest_entries () {
20182047
if [[ -r "${CONFIG_configfile}" ]]; then source "${CONFIG_configfile}"; echo "Parsed config file \"${CONFIG_configfile}\""; else let "N |= $N_config_file_missing"; fi; echo
20192048
if (( $opt_flag_config_file )); then if [[ -r "${opt_config_file}" ]]; then source "${opt_config_file}"; let "N |= $N_arg_conffile_parsed"; else let "N |= $N_arg_conffile_unreadable"; fi; else let "N |= $N_too_many_args"; fi
20202049

2050+
# load mysql commands
2051+
mysql_commands
2052+
20212053
export LC_ALL=C
20222054
PROGNAME=`basename $0`
20232055
PATH=${PATH}:/usr/local/bin:/usr/bin:/bin:/usr/local/mysql/bin
@@ -2214,7 +2246,7 @@ NO_ARGS=0
22142246
E_OPTERROR=85
22152247

22162248
if (( $# == $NO_ARGS )); then # Script invoked with no command-line args?
2217-
echo "Invoking backup method."; echo; method_backup
2249+
method_backup
22182250
fi
22192251

22202252
while getopts ":c:blh" Option

0 commit comments

Comments
 (0)