projects / packages / automysqlbackup.git / blame
| Commit | Line | Data |
|---|---|---|
| 4172dc19 ER |
1 | --- automysqlbackup-v3.0_rc6/automysqlbackup |
| 2 | +++ automysqlbackup-v3.0_rc6/automysqlbackup | |
| 3 | @@ -850,7 +850,6 @@ directory_checks_enable_logging () { | |
| 4 | [[ "${CONFIG_mysql_dump_dbstatus}" = 'yes' ]] && { checkdirs=( "${checkdirs[@]}" "${CONFIG_backup_dir}/status" ); } | |
| 5 | ||
| 6 | tmp_permcheck=0 | |
| 7 | - printf '# Checking for permissions to write to folders:\n' | |
| 8 | ||
| 9 | ||
| 10 | # "dirname ${CONFIG_backup_dir}" exists? | |
| 11 | @@ -873,14 +872,9 @@ directory_checks_enable_logging () { | |
| 12 | ||
| 13 | ||
| 14 | # -> check base folder | |
| 15 | - printf 'base folder %s ... ' "$(dirname "${CONFIG_backup_dir}")" | |
| 16 | if [[ -d "$(dirname "${CONFIG_backup_dir}")" ]]; then | |
| 17 | ||
| 18 | - printf 'exists ... ok.\n' | |
| 19 | - printf 'backup folder %s ... ' "${CONFIG_backup_dir}" | |
| 20 | - | |
| 21 | if [[ -d "${CONFIG_backup_dir}" ]]; then | |
| 22 | - printf 'exists ... writable? ' | |
| 23 | if (( $CONFIG_dryrun )); then | |
| 24 | printf 'dry-running. Skipping. Logging to /tmp\n' | |
| 25 | log_file="/tmp/${CONFIG_mysql_dump_host}-`date +%N`.log" | |
| 26 | @@ -889,7 +883,6 @@ directory_checks_enable_logging () { | |
| 27 | tmp_permcheck=1 | |
| 28 | else | |
| 29 | if chk_folder_writable "${CONFIG_backup_dir}"; then | |
| 30 | - printf 'yes. Proceeding.\n' | |
| 31 | log_file="${CONFIG_backup_dir}/${CONFIG_mysql_dump_host}-`date +%N`.log" | |
| 32 | log_errfile="${CONFIG_backup_dir}/ERRORS_${CONFIG_mysql_dump_host}-`date +%N`.log" | |
| 33 | activateIO "$log_file" "$log_errfile" | |
| 34 | @@ -1643,7 +1636,7 @@ method_backup () { | |
| 35 | load_default_config | |
| 36 | ||
| 37 | trap mail_cleanup EXIT SIGHUP SIGINT SIGQUIT SIGTERM | |
| 38 | - if [[ -r "${CONFIG_configfile}" ]]; then source "${CONFIG_configfile}"; echo "Parsed config file \"${CONFIG_configfile}\""; else let "N |= $N_config_file_missing"; fi; echo | |
| 39 | + if [[ -r "${CONFIG_configfile}" ]]; then source "${CONFIG_configfile}"; else let "N |= $N_config_file_missing"; fi | |
| 40 | 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 | |
| 41 | ||
| 42 | (( $CONFIG_dryrun )) && { | |
| 43 | @@ -2209,7 +2202,7 @@ NO_ARGS=0 | |
| 44 | E_OPTERROR=85 | |
| 45 | ||
| 46 | if (( $# == $NO_ARGS )); then # Script invoked with no command-line args? | |
| 47 | - echo "Invoking backup method."; echo; method_backup | |
| 48 | + method_backup | |
| 49 | fi | |
| 50 | ||
| 51 | while getopts ":c:blh" Option |