X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fgetem.sh;h=ace37be86673145800212ad702c669387b50def9;hb=88a4dcce8283a35723c94386b974a543852b77dc;hp=488e931ccf318ed448951a4f2ceda146c4cd4e18;hpb=e184d83e93e03f35a03cddfd8006a7793f8c4913;p=feisty_meow.git diff --git a/scripts/rev_control/getem.sh b/scripts/rev_control/getem.sh index 488e931c..ace37be8 100644 --- 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...). @@ -13,7 +13,7 @@ source "$FEISTY_MEOW_SCRIPTS/rev_control/rev_control.sh" tmpdir="$(cd $TMP; \pwd)" if [ "$(\pwd)" != "$tmpdir" ]; then if [ ! -z "$SHELL_DEBUG" ]; then - echo "Moving to the TMP directory to avoid file access conflicts..." + echo "moving to the TMP directory to avoid file access conflicts..." fi new_name="$TMP/zz_$(basename $0)" cp -f "$0" "$new_name" @@ -26,68 +26,25 @@ 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 2>&1 | grep -v "X11 forwarding request failed" - 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)" # perform the checkouts as appropriate per OS. if [ "$OS" != "Windows_NT" ]; then - checkout_list $HOME 2>&1 | tee -a "$TMPO_CHK" + checkout_list $HOME /usr/local 2>&1 | tee -a "$TMPO_CHK" else checkout_list $HOME c:/ d:/ e:/ 2>&1 | tee -a "$TMPO_CHK" fi ############## -# 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 ##############