snapshots-create.sh: hoist exclusion list creation to new script, remember to cleanup

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

1 files changed, 3 insertions, 21 deletions

diff --git a/snapshots-create.sh b/snapshots-create.sh
index 44efdf4..1344da6 100755
--- a/snapshots-create.sh
+++ b/snapshots-create.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2011-2015 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 2011-2017 Gentoo Foundation; Distributed under the GPL v2
 # might be earlier copyright, no history available
 
 # 1) Create the tarball
@@ -86,27 +86,8 @@ cd ${TEMP}
 write_time_log "START TARBALL		$(date -u)"
 if [ ! -f "${FILENAME%.bz2}" ]; then
 	# Build exclusion list
-	# app-bar/ChangeLog is a valid package name, so we have to be careful about it!
 	EXCLUSION_LIST="$(mktemp -p ${TEMP} snapshot-exclude.XXXXXXXXXX)"
-	find "${MASTER}" \
-		\( \
-			-type f \
-			-regextype posix-egrep \
-			\( \
-				-path "${MASTER}/eclass/ChangeLog*" -o \
-				-path "${MASTER}/profiles/ChangeLog*" -o \
-				-path "${MASTER}/profiles/*/ChangeLog*" -o \
-				-regex "${MASTER}/[^/]+/[^/]+/ChangeLog(-[0-9]+)?$" \
-			\) \
-		\) \
-		-o \
-		-name '.checksum-test-marker' \
-		\
-		| sed "s,${MASTER}/*,,g" \
-		\
-		| sort \
-		\
-		>"${EXCLUSION_LIST}"
+	"$(dirname $0)"/print-exclusion-list "${MASTER}" >"${EXCLUSION_LIST}"
 
 	TAR_OPTIONS=(
 	# Force a small block size
@@ -150,6 +131,7 @@ if [ ! -f "${FILENAME%.bz2}" ]; then
 		echo "Tar run failed!"
 		exit 1
 	fi
+	rm -f "${EXCLUSION_LIST}"
 fi
 [ ! -f " ${FILENAME}.umd5sum" ] && md5sum ${FILENAME%.bz2} > ${FILENAME}.umd5sum
 [ ! -f "${FILENAME%.bz2}.bz2" ] && ${NICE} $BZIP2_PROG -k9 ${FILENAME%.bz2}