aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2017-09-21 18:10:13 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2017-09-21 18:10:13 -0700
commitf171ecbd66a1c205fdb7331465b4662cfc16beff (patch)
tree2ebb21c6caaf2ec7188fa8a4d59ebecfea3972c6
parentcreate-squashfs-snapshot: use exclusion list. (diff)
downloadmastermirror-scripts-f171ecbd66a1c205fdb7331465b4662cfc16beff.tar.gz
mastermirror-scripts-f171ecbd66a1c205fdb7331465b4662cfc16beff.tar.bz2
mastermirror-scripts-f171ecbd66a1c205fdb7331465b4662cfc16beff.zip
Fixup print-exclusion-list usage.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rwxr-xr-xcreate-squashfs-snapshot3
-rwxr-xr-x[-rw-r--r--]print-exclusion-list.sh (renamed from print-exclusion-list)0
-rwxr-xr-xsnapshots-create.sh2
3 files changed, 2 insertions, 3 deletions
diff --git a/create-squashfs-snapshot b/create-squashfs-snapshot
index bcdcc17..1579877 100755
--- a/create-squashfs-snapshot
+++ b/create-squashfs-snapshot
@@ -74,7 +74,7 @@ trap 'rm -r "${tempdir}"' EXIT
# Build exclusion list
EXCLUSION_LIST="$(mktemp -p "${tempdir}" squashfs-exclude.XXXXXXXXXX)"
-"$(dirname $0)"/print-exclusion-list "${repodir}" >"${EXCLUSION_LIST}"
+"$(dirname $0)"/print-exclusion-list.sh "${repodir}" >"${EXCLUSION_LIST}"
mksquashfs_options+=( -ef "${EXCLUSION_LIST}" )
@@ -166,4 +166,3 @@ sha512sum -- *.sqfs *.sqdelta | \
gpg --yes -u "${signkeyid}" --clearsign \
--comment "Current: gentoo-${today}" --output sha512sum.txt.tmp -
mv sha512sum.txt.tmp sha512sum.txt
-rm -f "${EXCLUSION_LIST}"
diff --git a/print-exclusion-list b/print-exclusion-list.sh
index 583a492..583a492 100644..100755
--- a/print-exclusion-list
+++ b/print-exclusion-list.sh
diff --git a/snapshots-create.sh b/snapshots-create.sh
index 1344da6..99f4d63 100755
--- a/snapshots-create.sh
+++ b/snapshots-create.sh
@@ -87,7 +87,7 @@ write_time_log "START TARBALL $(date -u)"
if [ ! -f "${FILENAME%.bz2}" ]; then
# Build exclusion list
EXCLUSION_LIST="$(mktemp -p ${TEMP} snapshot-exclude.XXXXXXXXXX)"
- "$(dirname $0)"/print-exclusion-list "${MASTER}" >"${EXCLUSION_LIST}"
+ "$(dirname $0)"/print-exclusion-list.sh "${MASTER}" >"${EXCLUSION_LIST}"
TAR_OPTIONS=(
# Force a small block size