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 c80a1f6136e2ce2bcaa03825f5d3237326d73683..86c9531bf6f07027abed21eae2eccddaa3145ec8 100644 (file)
--- a/scripts/rev_control/getem.sh
+++ b/scripts/rev_control/getem.sh
@@ -2,8 +2,8 @@
 
 # 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"
+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
 # rude behavior with regard to file locking (ahem, windows...).
@@ -12,11 +12,11 @@ source "$FEISTY_MEOW_SCRIPTS/rev_control/rev_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
@@ -26,68 +26,29 @@ if [ "$(\pwd)" != "$tmpdir" ]; then
   exec "$new_name"
 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 .
-  elif [ -d ".svn" ]; then
-    svn update .
-  elif [ -d ".git" ]; then
-    git pull
-  else
-    echo unknown repository for $directory...
-  fi
-}
-
-# gets all the updates for a list of folders under revision control.
-function checkout_list {
-  list=$*
-  for i in $list; do
-    # turn repo list back into an array.
-    eval "repository_list=( ${REPOSITORY_LIST[*]} )"
-    for j in "${repository_list[@]}"; do
-      # add in the directory for our purposes here.
-      j="$i/$j"
-      if [ ! -d $j ]; then
-        if [ ! -z "$SHELL_DEBUG" ]; then
-          echo "No directory called $j exists."
-        fi
-        continue
-      fi
-
-      pushd $j &>/dev/null
-      echo -n "retrieving '$j'...  "
-      do_update $j
-      popd &>/dev/null
-    done
-  done
-}
-
 ##############
 
 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
 
 ##############