diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2020-01-04 22:58:40 -0800 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2020-01-04 22:58:40 -0800 |
| commit | 8052ccee7f0364c9aba454aa73c727d7786e05f1 (patch) | |
| tree | 8d081155ef74ac3746a797d328f70aacf07235dd | |
| parent | snapshots-create.sh: fix cleanup code (diff) | |
| download | mastermirror-scripts-8052ccee7f0364c9aba454aa73c727d7786e05f1.tar.gz mastermirror-scripts-8052ccee7f0364c9aba454aa73c727d7786e05f1.tar.bz2 mastermirror-scripts-8052ccee7f0364c9aba454aa73c727d7786e05f1.zip | |
snapshots-create.sh: improve snapshot creation temp filenames20200105T065909Z
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
| -rwxr-xr-x | snapshots-create.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/snapshots-create.sh b/snapshots-create.sh index b397754..e0f188d 100755 --- a/snapshots-create.sh +++ b/snapshots-create.sh @@ -318,12 +318,16 @@ write_time_log "END SIGN $(date -u)" write_time_log "START DELTA $(date -u)" PATCH=snapshot-${DELTA_BASE}-${YESTERDAY}.patch.bz2 if [ ! -f "${PATCH}" ]; then - ${NICE} ${BZIP2_PROG} -dkc "${previous_snapshot}" > orig - /usr/bin/differ -f bdelta orig ${FILENAME%.bz2} ${PATCH%.bz2} - ${NICE} ${BZIP2_PROG} -9 ${PATCH%.bz2} - md5sum ${PATCH} > ${PATCH}.md5sum - chmod 644 ${PATCH}{,.md5sum} - mv ${PATCH}{,.md5sum} ${DELTA_UPLOAD} + SNAPSHOT_BASE="${TEMP}"/$(basename "${previous_snapshot%.bz2}")-snapshotbase + ${NICE} ${BZIP2_PROG} -dkc "${previous_snapshot}" > "${SNAPSHOT_BASE}" + /usr/bin/differ -f bdelta \ + "${SNAPSHOT_BASE}" \ + "${FILENAME%.bz2}" \ + "${PATCH%.bz2}" + ${NICE} ${BZIP2_PROG} -9 "${PATCH%.bz2}" + md5sum "${PATCH}" > "${PATCH}.md5sum" + chmod 644 "${PATCH}"{,.md5sum} + mv "${PATCH}"{,.md5sum} "${DELTA_UPLOAD}" fi write_time_log "END DELTA $(date -u)" # end 5) |