From 507ead2ad119968e5066ce69094c81a911c2a8d0 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Sat, 4 Nov 2017 17:01:56 -0400 Subject: [PATCH] attempting to ignore vendor folders for php may not be quite right yet. --- scripts/rev_control/version_control.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 8c1fbf27..e1b01e94 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -54,12 +54,6 @@ function is_home_system() home_system= if [[ $this_host == *.gruntose.blurgh ]]; then home_system=true -#temp code -elif [[ $this_host == buildy ]]; then -home_system=true -elif [[ $this_host == simmy ]]; then -home_system=true -#temp code fi } @@ -104,6 +98,7 @@ function compute_modifier() is_home_system # special override to pick local servers when at home. if [ "$home_system" == "true" ]; then +#what was this section for again? if [ "$in_or_out" == "out" ]; then # need the right home machine for modifier when checking out. #huhhh? modifier="svn://shaggy/" @@ -366,8 +361,12 @@ function generate_rev_ctrl_filelist() local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )" local tempfile=$(mktemp /tmp/zz_checkins.XXXXXX) echo >$tempfile - find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null - find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null + local additional_filter + if [ ! -z "NO_CHECKIN_VENDOR" ]; then + additional_filter='-a ! -iname "*\/vendor\/*" ' + fi + find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" $additional_filter -exec echo {}/.. ';' >>$tempfile 2>/dev/null + find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" $additional_filter -exec echo {}/.. ';' >>$tempfile 2>/dev/null # CVS is not well behaved like git and (now) svn, and we seldom use it anymore. popd &>/dev/null local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX) -- 2.34.1