diff options
| -rwxr-xr-x | create-squashfs-snapshot | 2 | ||||
| -rwxr-xr-x | datestamp.sh | 14 | ||||
| -rwxr-xr-x | snapshots-create.sh | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/create-squashfs-snapshot b/create-squashfs-snapshot index d0755fd..d485c63 100755 --- a/create-squashfs-snapshot +++ b/create-squashfs-snapshot @@ -38,7 +38,7 @@ mirrordir=${UPLOAD}/squashfs # without having to keep them in full size. revdeltadir=${BASE}/squashfs-tmp # This is where the master (unpacked) copy of the repository is located. -repodir=${FINALDIR} +repodir=${FINALDIR_repo_gentoo} # GPG key ID to sign with signkeyid="DCD05B71EAB94199527F44ACDB6B8C1F96D8BF6D" diff --git a/datestamp.sh b/datestamp.sh index 0879758..5adad9f 100755 --- a/datestamp.sh +++ b/datestamp.sh @@ -5,14 +5,14 @@ umask 022 # ensure globally readable perms on new files for rsyncd source /usr/local/bin/mastermirror/rsync-gen.vars -# The only time ${STAGEDIR}/metadata should not exist is when rsync-gen.sh +# The only time ${STAGEDIR_repo_gentoo}/metadata should not exist is when rsync-gen.sh # hasn't ran even once yet -if [[ -d ${STAGEDIR}/metadata ]]; then - /bin/date -u '+%s %c' > ${STAGEDIR}/metadata/timestamp.x.tmp - /bin/mv ${STAGEDIR}/metadata/timestamp.x.tmp ${STAGEDIR}/metadata/timestamp.x +if [[ -d ${STAGEDIR_repo_gentoo}/metadata ]]; then + /bin/date -u '+%s %c' > ${STAGEDIR_repo_gentoo}/metadata/timestamp.x.tmp + /bin/mv ${STAGEDIR_repo_gentoo}/metadata/timestamp.x.tmp ${STAGEDIR_repo_gentoo}/metadata/timestamp.x fi -if [[ -d ${FINALDIR}/metadata ]]; then - /bin/date -R -u > ${FINALDIR}/metadata/timestamp.chk.tmp - /bin/mv ${FINALDIR}/metadata/timestamp.chk.tmp ${FINALDIR}/metadata/timestamp.chk +if [[ -d ${FINALDIR_repo_gentoo}/metadata ]]; then + /bin/date -R -u > ${FINALDIR_repo_gentoo}/metadata/timestamp.chk.tmp + /bin/mv ${FINALDIR_repo_gentoo}/metadata/timestamp.chk.tmp ${FINALDIR_repo_gentoo}/metadata/timestamp.chk fi diff --git a/snapshots-create.sh b/snapshots-create.sh index 2d1f241..08e5192 100755 --- a/snapshots-create.sh +++ b/snapshots-create.sh @@ -15,7 +15,7 @@ umask 022 source /usr/local/bin/mastermirror/rsync-gen.vars # locations (if used in multiple files, please move to rsync-gen.vars file) -MASTER="${FINALDIR}" # the master gentoo-x86 copy +MASTER="${FINALDIR_repo_gentoo}" # the master gentoo-x86 copy TEMP="${BASE}/snapshots-tmp/" # working directory HISTORY="7" #number in dsays of previous snapshots to keep DELTA_UPLOAD="${UPLOAD}/deltas/" |