X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=8e9ba78b7ac40b71fb5437cd433ebd4d20961af6;hb=0065bf38d3d757f7d731ba9be7984ea7dab39384;hp=96a8558e8a1d7fa20864e18d5b4b58be38dfeeeb;hpb=fb1931d2f6fdc1e7ed96d1b3f854612a04cd35da;p=feisty_meow.git diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 96a8558e..8e9ba78b 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -61,7 +61,8 @@ function do_revctrl_checkin() # make a nice echoer since we want to use it inside conditions below. local nicedir="$directory" if [ $nicedir == "." ]; then - nicedir=$(\pwd) + nicedir="$( \cd . && /bin/pwd )" +#echo "calculated nicedir as '$nicedir'" fi local blatt_report="echo -ne \nchecking in '$nicedir'... " local tell_no_checkin="echo -ne \nskipping check-in due to presence of $NO_CHECKIN sentinel file: $nicedir" @@ -286,10 +287,15 @@ function check_branch_state() # showes the branch currently active in the repository. function show_active_branch() { -#hmmm: if no args, assume current dir! +#hmmm: if no args, assume current dir!? for directory in "$@"; do - echo -n "active branch for '$directory': " + if [ $directory == "." ]; then + directory="$( \cd . && /bin/pwd )" +#echo "calculated directory as '$directory'" + fi + + echo -n -e "$(basename $directory)\n\t=> branch " pushd "$directory" &>/dev/null #hmmm: if git...