Skip to content
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

fix: corrected diskspace calculation in case of docker usage #864

Merged
merged 8 commits into from
Apr 5, 2019
Merged

fix: corrected diskspace calculation in case of docker usage #864

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8f1071d
Small type
Tanarri Mar 26, 2019
a2c6924
Info text corrected
Tanarri Mar 26, 2019
23178af
nc-restore: fix typo
nachoparker Mar 26, 2019
e7ae08c
nc-restore: fix typo
nachoparker Mar 26, 2019
16d636a
fix: corrected diskspace calculation in case of docker usage
paschaef Mar 29, 2019
5c37985
fix: corrected free space calculation irespective of docker/native env
paschaef Apr 1, 2019
c8ba5c8
Merge branch 'master' into master
paschaef Apr 2, 2019
d2061d8
fix: fix space calculation as done in previous commit c18273a
paschaef Apr 3, 2019
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
13 changes: 9 additions & 4 deletions bin/ncp/BACKUPS/nc-backup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,17 @@ fail() { local ret=$?; echo "Abort..." ; rm -f "${dbbackup}" "${destfile}"; $
trap cleanup EXIT
trap fail INT TERM HUP ERR

echo "check free space..." # allow at least ~100 extra MiB
echo "check free space..." # allow at least ~500 extra MiB
mkdir -p "$destdir"
[[ "$includedata" == "yes" ]] && \
dsize=$(du -sb "$datadir" | awk '{ print $1 }')
dsize=$(du -sb "$datadir" | awk '{ print $1 }')
nsize=$(du -sb "$basedir/nextcloud" | awk '{ print $1 }')
size=$((nsize + dsize + 100*1024))
margin=$((500*1024)) # safety margin to allow additional space
if [[ "$includedata" == "yes" ]]
then
size=$((nsize + margin))
else #datadir is inside $basedir/nextcloud therefor substract
size=$((nsize - dsize + margin))
fi
free=$( df -B1 "$destdir" | tail -1 | awk '{ print $4 }' )

[ $size -ge $free ] && {
Expand Down