adopted two new variables

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

diff --git a/scripts/rev_control/getem.sh b/scripts/rev_control/getem.sh
index e8ff547f930d4a086369f6bb737dead2a71d3e4c..86c9531bf6f07027abed21eae2eccddaa3145ec8 100644 (file)
--- a/scripts/rev_control/getem.sh
+++ b/scripts/rev_control/getem.sh
@@ -2,7 +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/core/launch_feisty_meow.sh"
 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
@@ -12,11 +12,11 @@ source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 # first so we can do an orange-to-orange compare.
 tmpdir="$(cd $TMP; \pwd)"
 if [ "$(\pwd)" != "$tmpdir" ]; then
-  if [ ! -z "$SHELL_DEBUG" ]; then
-    echo "Moving to the TMP directory to avoid file access conflicts..."
+  if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
+    echo "moving to the TMP directory to avoid file access conflicts..."
   fi
   new_name="$TMP/zz_$(basename $0)"
-  cp -f "$0" "$new_name"
+  \cp -f "$0" "$new_name"
   if [ $? -ne 0 ]; then
     echo "failed to copy this script up to the TMP directory.  exploit attempted?"
     exit 1
@@ -32,22 +32,23 @@ export TMPO_CHK=$TMP/zz_chk.log
 
 rm -f "$TMPO_CHK"
 
-echo "Getting repositories at: $(date)"
+echo "getting repositories at: $(date)"
+echo
 
 # perform the checkouts as appropriate per OS.
-if [ "$OS" != "Windows_NT" ]; then
-  checkout_list $HOME 2>&1 | tee -a "$TMPO_CHK"
-else
-  checkout_list $HOME c:/ d:/ e:/ 2>&1 | tee -a "$TMPO_CHK"
+FULL_LIST="$(dirname $FEISTY_MEOW_APEX) $HOME"
+#if [ "$OS" != "Windows_NT" ]; then
+#  checkout_list $HOME /usr/local 2>&1 | tee -a "$TMPO_CHK"
+#else
+if [ "$OS" == "Windows_NT" ]; then
+  FULL_LIST+="c:/ d:/ e:/"
 fi
+checkout_list $FULL_LIST 2>&1 | tee -a "$TMPO_CHK"
 
 ##############
 
-# we now regenerate the scripts after getme, to ensure it's done automatically.
-bash "$FEISTY_MEOW_SCRIPTS/core/bootstrap_shells.sh"
-perl "$FEISTY_MEOW_SCRIPTS/core/generate_aliases.pl"
-echo
-nechung
+# regenerate the scripts after getting latest version of feisty meow.
+regenerate
 
 ##############