From 1b956c3a7796a717443513a8cf0fb15e9d70c023 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 16 Apr 2021 08:22:18 +1000
Subject: [PATCH] to_ozlabs: cleanup

---
 to_ozlabs | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/to_ozlabs b/to_ozlabs
index e1d30c8..5666c9f 100755
--- a/to_ozlabs
+++ b/to_ozlabs
@@ -1,17 +1,23 @@
 #!/bin/bash
 
-GIT_REPOS="next next-history.git quilt next-fixes tools etc mmotm"
+GIT_REPOS='next next-history.git quilt next-fixes tools etc mmotm'
 
-cd ~/kernels/next
+NEXT_DIR="$HOME/kernels/next"
 
-echo "Updating Linus' tree"
-ssh ozlabs.org "cd kernels/linus.git; git remote update"
+if ! cd "$NEXT_DIR"; then
+	printf '%s: cannot cd to %s\n' "$0" "$NEXT_DIR" 1>&2
+	exit 1
+fi
+
+printf 'Updating Linus'\'' tree\n'
+ssh ozlabs.org 'cd kernels/linus.git; git remote update'
 
 for i in $GIT_REPOS; do
-	echo "Pushing $i"
-	( cd $i; git push --prune bilbo )
-	[ "${i%.git}" = "$i" ] &&
-		ssh ozlabs.org "cd kernels/next/$i; git reset --hard"
+	printf 'Pushing %s\n' "$i"
+	( cd "$i" && git push --prune bilbo )
+	if [ "${i%.git}" = "$i" ]; then
+		ssh ozlabs.org 'cd kernels/next/'"$i"'; git reset --hard'
+	fi
 done
 
 {
@@ -35,9 +41,16 @@ EOF
 	done
 } | rsync -avHP --open-noatime --include-from - --delete . ozlabs.org:kernels/next/.
 
-ssh ozlabs.org "touch kernels/NEXT-DONE"
+ssh ozlabs.org 'touch kernels/NEXT-DONE'
 
 # Fix up the git configs so that the next pushes will work
-ssh ozlabs.org 'cd kernels/next; for i in '"$GIT_REPOS"'; do ( cd $i; git config receive.denyCurrentBranch ignore; ); done'
+ssh ozlabs.org '
+cd kernels/next
+for i in '"$GIT_REPOS"'; do
+(
+	cd $i
+	git config receive.denyCurrentBranch ignore
+)
+done'
 
 exit 0
-- 
2.39.2