Skip to content

fix(restore): estimate tar size portably on macOS #2922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
patil2001 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(restore): estimate tar size portably on macOS #2922

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ods/ods-restore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ estimate_restore_bytes_dir() {
# Estimate restore size for a tar.gz (uncompressed file sizes)
estimate_restore_bytes_tar() {
local tar_path="$1"
# tar -tv lists size in column 3
tar -tvzf "$tar_path" 2>/dev/null | awk '{sum += $3} END {print sum+0}'
# tar -tv lists the byte size as the first pure-numeric field on GNU and BSD
tar -tvzf "$tar_path" 2>/dev/null | awk '{ for (i=1; i<=NF; i++) { if ($i ~ /^[0-9]+$/ && $i+0 > 0) { sum += $i+0; break } } } END { print sum+0 }'
}

ensure_restore_space() {
Expand Down
Loading