improved look of output from check-ins

[feisty_meow.git] / scripts / rev_control / getem.sh

diff --git a/scripts/rev_control/getem.sh b/scripts/rev_control/getem.sh
index 3818b588f11ed69a7ab6139727239f62d7790c2a..da9cb3913482df743d2d664f28de0d32a8c1e842 100644 (file)
--- a/scripts/rev_control/getem.sh
+++ b/scripts/rev_control/getem.sh
@@ -7,11 +7,12 @@ source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 
 ##############
 
-# trickery to ensure we can always update this file, even when the operating system has some
-# rude behavior with regard to file locking (ahem, windows...).
-# and even more rudeness is that the pwd and $TMP may not always be in the same form,
-# which causes endless confusion and badness.  that's why we get the pwd reading for TMP
-# first so we can do an orange-to-orange compare.
+# trickery to ensure we can always update feisty meow, including this specific
+# file, even when the operating system has some rude behavior with regard to
+# file locking (ahem, windoze).  and even more rudeness is that the pwd and
+# $TMP may not always be in the same form, which causes endless confusion and
+# badness.  that's why we get the pwd reading for TMP first so we can do an
+# oranges-to-oranges compare.
 tmpdir="$(cd $TMP; \pwd)"
 if [ "$(\pwd)" != "$tmpdir" ]; then
   if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
@@ -19,12 +20,14 @@ if [ "$(\pwd)" != "$tmpdir" ]; then
   fi
   new_name="$TMP/zz_$(basename $0)"
   \cp -f "$0" "$new_name"
-  test_or_die "failed to copy this script up to the TMP directory.  exploit attempted?"
-  cd "$TMP"
+  exit_on_error "failed to copy this script up to the TMP directory.  exploit attempted?"
+  pushd "$TMP" &>/dev/null
+  exit_on_error "changing to TMP directory: $TMP"
   chmod a+x "$new_name"
-  test_or_die "chmodding of file: $new_name"
+  exit_on_error "chmodding of file: $new_name"
   exec "$new_name"
-  test_or_die "execing cloned getemscript"
+  exit_on_error "execing cloned getemscript"
+  popd &>/dev/null
 fi
 
 ##############
@@ -32,7 +35,7 @@ fi
 export TMPO_CHK=$TMP/zz_chk.log
 
 rm -f "$TMPO_CHK"
-test_or_die "removing file: $TMPO_CHK"
+exit_on_error "removing file: $TMPO_CHK"
 
 echo "getting repositories at: $(date)"
 echo
@@ -43,7 +46,7 @@ if [ "$OS" == "Windows_NT" ]; then
   FULL_LIST+="c:/ d:/ e:/"
 fi
 checkout_list $FULL_LIST 2>&1 | tee -a "$TMPO_CHK"
-test_or_die "checking out list: $FULL_LIST"
+exit_on_error "checking out list: $FULL_LIST"
 
 ##############