X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fgetem.sh;h=f31a86caaf62f9631785fd23642d8b9952291eb3;hb=a6f0bcc36018952427cbab16387e06ebac58ddb6;hp=f493ddbaa0877680d94ddd7079612faf5bb3d9b8;hpb=98665374b13d0b7b32642ac7948580028edfe58a;p=feisty_meow.git

diff --git a/scripts/rev_control/getem.sh b/scripts/rev_control/getem.sh
old mode 100755
new mode 100644
index f493ddba..f31a86ca
--- a/scripts/rev_control/getem.sh
+++ b/scripts/rev_control/getem.sh
@@ -2,6 +2,7 @@
 
 # gets any updates for the repository folders present in the REPOSITORY_LIST variable.
 
+source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 source "$FEISTY_MEOW_SCRIPTS/rev_control/rev_control.sh"
 
 # trickery to ensure we can always update this file, even when the operating system has some
@@ -25,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
+    git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
   else
     echo unknown repository for $directory...
   fi
@@ -71,6 +90,8 @@ export TMPO_CHK=$TMP/zz_chk.log
 
 rm -f "$TMPO_CHK"
 
+echo "Getting repositories at: $(date)"
+
 # perform the checkouts as appropriate per OS.
 if [ "$OS" != "Windows_NT" ]; then
   checkout_list $HOME 2>&1 | tee -a "$TMPO_CHK"
@@ -78,8 +99,6 @@ else
   checkout_list $HOME c:/ d:/ e:/ 2>&1 | tee -a "$TMPO_CHK"
 fi
 
-less $TMPO_CHK
-
 ##############
 
 # we now regenerate the scripts after getme, to ensure it's done automatically.