diff --git a/bin/backup.sh b/bin/backup.sh index 067c32f..d4eba8c 100755 --- a/bin/backup.sh +++ b/bin/backup.sh @@ -208,8 +208,10 @@ backup_folders() { # 执行打包 log_info "开始打包文件夹..." + log_info "排除规则: ${exclude_args}" if eval "tar -czf '${folders_tar}' ${exclude_args} ${tar_sources}" 2>&1; then - log_info "文件夹备份完成: ${folders_tar}" + local tar_size=$(du -h "${folders_tar}" | cut -f1) + log_info "文件夹备份完成: ${folders_tar} (大小: ${tar_size})" echo "${folders_tar}" else log_error "文件夹备份失败" @@ -321,12 +323,18 @@ merge_backups() { local files_list="" if [[ -n "${folders_tar}" ]] && [[ -f "${folders_tar}" ]]; then files_list+=" ${folders_tar#${TEMP_DIR}/}" + log_info "添加到合并: ${folders_tar#${TEMP_DIR}/} ($(du -h "${folders_tar}" | cut -f1))" fi if [[ -n "${mysql_dump}" ]] && [[ -f "${mysql_dump}" ]]; then files_list+=" ${mysql_dump#${TEMP_DIR}/}" + log_info "添加到合并: ${mysql_dump#${TEMP_DIR}/} ($(du -h "${mysql_dump}" | cut -f1))" fi - tar -czf "${final_backup}" -C "${TEMP_DIR}" ${files_list} + log_info "执行合并打包..." + if ! tar -czf "${final_backup}" -C "${TEMP_DIR}" ${files_list} 2>&1; then + log_error "tar 合并命令执行失败" + return 1 + fi if [[ -f "${final_backup}" ]]; then local file_size=$(du -h "${final_backup}" | cut -f1)