From e4eea012d9e58e801aa0447244a879a79d789db7 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Wed, 23 Jan 2013 10:40:10 -0500 Subject: [PATCH] updated to squash first few line feeds in checkout output, so that we don't have an unnecessarily long listing when nothing has changed. --- scripts/rev_control/getem.sh | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/scripts/rev_control/getem.sh b/scripts/rev_control/getem.sh index 488e931c..f31a86ca 100644 --- a/scripts/rev_control/getem.sh +++ b/scripts/rev_control/getem.sh @@ -26,17 +26,35 @@ if [ "$(\pwd)" != "$tmpdir" ]; then exec "$new_name" fi +# takes out the first few carriage returns that are in the input. +function squash_first_few_crs() +{ + i=0 + while read line; do + i=$((i+1)) + if [ $i -le 3 ]; then + echo -n "$line " + else + echo $line + fi + done + if [ $i -le 3 ]; then + # if we're still squashing eols, make sure we don't leave them hanging. + echo + fi +} + # selects the checkout method based on where we are (the host the script runs on). function do_update() { directory="$1"; shift - + if [ -d "CVS" ]; then - cvs update . + cvs update . | squash_first_few_crs elif [ -d ".svn" ]; then - svn update . + svn update . | squash_first_few_crs elif [ -d ".git" ]; then - git pull 2>&1 | grep -v "X11 forwarding request failed" + git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs else echo unknown repository for $directory... fi -- 2.34.1