do_build: consolidate failure action

[next-scripts] / to_ozlabs

diff --git a/to_ozlabs b/to_ozlabs
index a4f682a03dbc16b982a2efd3242949513a9f0f8e..5b0a440fc4cfea3fc7e95880cd456b61fa53bfaa 100755 (executable)
--- a/to_ozlabs
+++ b/to_ozlabs
@@ -1,30 +1,26 @@
 #!/bin/bash
 
-echo "Updating Linus' tree"
-ssh ozlabs.org "cd kernels/linus.git; git remote update"
+GIT_REPOS='next  next-fixes'
 
-echo "Pushing next"
-cd ~/kernels/next/next
-git push bilbo
-ssh ozlabs.org "cd kernels/next/next; git reset --hard"
+NEXT_DIR="$HOME/kernels/next"
 
-echo "Pushing next-history"
-cd ~/kernels/next/next-history.git
-git push bilbo
+if ! cd "$NEXT_DIR"; then
+       printf '%s: cannot cd to %s\n' "$0" "$NEXT_DIR" 1>&2
+       exit 1
+fi
 
-echo "Pushing quilt"
-cd ~/kernels/next/quilt
-git push bilbo
-ssh ozlabs.org "cd kernels/next/quilt; git reset --hard"
+printf 'Updating Linus'\'' tree\n'
+ssh ozlabs.org 'cd kernels/linus.git; git remote update'
 
-echo "Pushing next-fixes"
-cd ~/kernels/next/next-fixes
-git push bilbo
-ssh ozlabs.org "cd kernels/next/next-fixes; git reset --hard"
+cat <<EOF | rsync -avHP --open-noatime --include-from - --delete . ozlabs.org:kernels/next/.
+- gitk.cache
+- /merge.debug
+- /merge.log
+- /summ
+- /patch-*-next-2*
+- /next-2*/
+EOF
 
-cd ../../
-rsync -avHP --exclude gitk.cache --exclude 'patch-*-next-2*' --exclude next-2'*'/ --exclude next/'**' --exclude quilt/'**' --exclude next-fixes/'**' --exclude next-history.git/'**' --delete next/ ozlabs.org:kernels/next/
-
-ssh ozlabs.org "touch kernels/NEXT-DONE"
+ssh ozlabs.org 'touch kernels/NEXT-DONE'
 
 exit 0