X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fgetme.sh;h=92c3ee55e73039c79fd5acba4be286b70b485535;hb=59c7011aceee4a122495f92de0dc191fbb4f8293;hp=4acd84e7b00683b94d8dce04669776cb3750045c;hpb=2952ccf47b80174880141a7ecfa122089f349b8d;p=feisty_meow.git

diff --git a/scripts/rev_control/getme.sh b/scripts/rev_control/getme.sh
index 4acd84e7..92c3ee55 100644
--- a/scripts/rev_control/getme.sh
+++ b/scripts/rev_control/getme.sh
@@ -2,7 +2,7 @@
 
 # gets all of fred's revision control folders out.
 
-source "$SHELLDIR/rev_control/rev_control.sh"
+source "$FEISTY_MEOW_SCRIPTS/rev_control/rev_control.sh"
 
 if [ "$(pwd)" != "$TMP" ]; then
 #  echo "Moving to the TMP directory to avoid file access conflicts..."
@@ -24,32 +24,14 @@ function do_update()
 {
   directory="$1"; shift
 
-  # get the right modifier for the directory name.
-  compute_modifier "$directory" "out"
-
-  is_svn=1
-  checkout_cmd="echo unknown repository for $directory...  "
-
-  if [ "$home_system" == "true" ]; then
-    checkout_cmd="svn update ."
-  fi
-
-  # then we pretty much ignore what we guessed, and just use the
-  # appropriate command for what we see inside the directory.
-  if [ -d "$directory/CVS" ]; then
-    checkout_cmd="cvs co -P -kb "
-    modifier=  # reset the modifier, since we know we have cvs.
-    is_svn=0
-  elif [ -d "$directory/.svn" ]; then
-    checkout_cmd="svn update ."
-  fi
-
-  if [ $is_svn -eq 1 ]; then
-    pushd "$directory" &>/dev/null
-    $checkout_cmd
-    popd &>/dev/null
+  if [ -d "CVS" ]; then
+    cvs update .
+  elif [ -d ".svn" ]; then
+    svn update .
+  elif [ -d ".git" ]; then
+    git pull
   else
-    $checkout_cmd "$modifier$directory"
+    echo unknown repository for $directory...
   fi
 }
 
@@ -57,16 +39,15 @@ function checkout_list {
   list=$*
   for i in $list; do
 #this list should be part of the configuration file, not part of script.
-    for j in $i/feisty_meow $i/hoople $i/hoople2 $i/quartz $i/web $i/yeti $i/xsede/xsede_tests $i/xsede/code/cak0l/trunk ; do
+    for j in $i/feisty_meow $i/hoople $i/hoople1 $i/hoople2 $i/quartz $i/web $i/yeti $i/xsede/xsede_tests $i/xsede/code/cak0l/trunk ; do
       if [ ! -d $j ]; then
 #        echo no directory called $j exists
         continue
       fi
 
-      pushd $i &>/dev/null
+      pushd $j &>/dev/null
       echo -n "retrieving '$j'...  "
       do_update $j
-#$(basename $j)
       popd &>/dev/null
     done
   done
@@ -84,8 +65,8 @@ fi
 less $TMPO_CHK
 
 # we now regenerate the scripts after getme, to ensure it's done automatically.
-bash "$SHELLDIR/core/bootstrap_shells.sh"
-perl "$SHELLDIR/core/generate_aliases.pl"
+bash "$FEISTY_MEOW_SCRIPTS/core/bootstrap_shells.sh"
+perl "$FEISTY_MEOW_SCRIPTS/core/generate_aliases.pl"
 echo
 nechung