From: Chris Koeritz Date: Mon, 12 Jan 2015 20:27:25 +0000 (-0500) Subject: fixed some weird issues when code is living on a link. X-Git-Tag: 2.140.90~721 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=1af1e28236fe8ee9d6ccc158ef1b2b4755707a44;p=feisty_meow.git fixed some weird issues when code is living on a link. --- diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 250812e2..eac16d42 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 + find $dirhere -follow -maxdepth 5 -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile # 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)]"