X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=5f5725c09543164319b397a830713172213f1516;hb=0ee49b548b0987edae2e5a19a279c82012923263;hp=250812e24b380a5dc578e6872c0300dc51e7d600;hpb=b0dc4fac8584aa6c39224145a67be257a7f3c3cc;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 250812e2..5f5725c0 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -255,11 +255,11 @@ function generate_rev_ctrl_filelist() { local dir="$1"; shift pushd "$dir" &>/dev/null - local dirhere="$(\pwd)" + local dirhere="$( \cd "$(\dirname "$dir")" && \pwd )" local tempfile=$(mktemp /tmp/zz_rev_checkin.XXXXXX) echo >$tempfile - find $dirhere -maxdepth 5 -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile - find $dirhere -maxdepth 5 -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile + find $dirhere -follow -maxdepth 5 -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null + find $dirhere -follow -maxdepth 5 -type d -iname ".git" -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_rev_checkin_sort.XXXXXX) @@ -275,10 +275,7 @@ function perform_revctrl_action_on_file() local tempfile="$1"; shift local action="$1"; shift -# dirs=($(cat $tempfile)) - while read -u 3 dirname; do -# for dirname in "${dirs[@]}"; do if [ -z "$dirname" ]; then continue; fi pushd "$dirname" &>/dev/null echo "[$(pwd)]"