X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fgetem.sh;h=e0fcdef372f7f5d3e2310d36b08f5340855f1f58;hb=68f16b40d564a399b525b24ee045f640482c7f96;hp=3818b588f11ed69a7ab6139727239f62d7790c2a;hpb=170a8e062d9283e65716e7aa55930ade13a66f7a;p=feisty_meow.git

diff --git a/scripts/rev_control/getem.sh b/scripts/rev_control/getem.sh
index 3818b588..e0fcdef3 100644
--- a/scripts/rev_control/getem.sh
+++ b/scripts/rev_control/getem.sh
@@ -5,13 +5,16 @@
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 
+save_terminal_title
+
 ##############
 
-# 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 +22,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,10 +37,9 @@ 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
 
 # perform the checkouts as appropriate per OS.
 FULL_LIST="$(dirname $FEISTY_MEOW_APEX) $HOME"
@@ -43,7 +47,9 @@ 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"
+
+echo
 
 ##############
 
@@ -52,3 +58,5 @@ regenerate
 
 ##############
 
+restore_terminal_title
+