[gentoo-commits] proj/releng:bug-670458 commit in: scripts/

[gentoo-commits] proj/releng:bug-670458 commit in: scripts/

[Matt Turner]

commit:     e8239f85698902e17d9774c01a0075d855c64d75
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 21 18:38:04 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 21 18:38:33 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=e8239f85

fixup! scripts/copy_buildsync: shellcheck pass

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 scripts/copy_buildsync.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 26ac58dc..4e486bf3 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -102,7 +102,7 @@ copy_arch_to_outgoing() {
 				\( -not -path '*/\.*' \) \
 				-print0 \
 				| xargs -0 --no-run-if-empty \
-				"$DEBUGP" rm "$VERBOSEP" -f
+				$DEBUGP rm $VERBOSEP -f
 		else
 			echo "Not deleting ${indir}/*${i}*, rsync failed!" 1>&2
 			fail=1
@@ -221,10 +221,10 @@ process_arch() {
 				| grep -E -v -f "${keepfile}" \
 				| tail -n +5); do
 
-			"$DEBUGP" rm "$VERBOSEP" -rf "$(pwd)"/"${i}"
+			$DEBUGP rm $VERBOSEP -rf "$(pwd)"/"${i}"
 		done
 
-		"$DEBUGP" rm "$VERBOSEP" -rf "${tmpdir}"
+		$DEBUGP rm $VERBOSEP -rf "${tmpdir}"
 
 	else
 		echo "There was some failure for $ARCH during the weekly sync. Not doing cleanup for fear of dataloss." 1>&2

[gentoo-commits] proj/releng:bug-670458 commit in: scripts/

[Matt Turner]

commit:     e4b4bf10d87e1a804d5407d56128e5b42982ebdc
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 21 18:55:01 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 21 18:55:01 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=e4b4bf10

fixup! scripts/copy_buildsync: shellcheck pass

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 scripts/copy_buildsync.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 4e486bf3..5e4046c4 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -185,7 +185,7 @@ process_arch() {
 	keepfile="${tmpdir}/.keep.${ARCH}.txt"
 	keepfile_tmp=$(mktemp -p "${tmpdir}" -t ".keep.${ARCH}.txt.XXXXXX")
 	echo -n '' >"${keepfile_tmp}"
-	chmod 644 "${keepfile}"
+	chmod 644 "${keepfile_tmp}"
 	for v in $variants ; do
 		# FIXME: trace the $a variable in this!
 		variant_path=$(find 20* -iname "${v}-20*" "${find_variants[@]}" -print 2>/dev/null | sed -e "s,.*/$a/autobuilds/,,g" | sort -k1,1 -t/ | tail -n1 )