From 9ebc8de9b7f5697cacf71832a8a1ba291062fb66 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Sun, 20 May 2018 10:58:21 -0400 Subject: [PATCH] better output yet previous check-in removed the separators which had proven to be annoying. this one gets the spacing right for the retrieval and then check-in logging. --- scripts/rev_control/checkin.sh | 1 - scripts/rev_control/version_control.sh | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/rev_control/checkin.sh b/scripts/rev_control/checkin.sh index 0ecd4fee..5519f68b 100644 --- a/scripts/rev_control/checkin.sh +++ b/scripts/rev_control/checkin.sh @@ -8,7 +8,6 @@ source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh" ############## echo "committing repositories at: $(date)" -echo FULL_LIST=" $(dirname $FEISTY_MEOW_APEX) $HOME " if [ "$OS" == "Windows_NT" ]; then diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 3016a77c..9b9704c2 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -90,7 +90,7 @@ function do_checkin() local blatt="echo -ne \nchecking in '$nicedir'... " do_update "$directory" - exit_on_error "repository update--this should be fixed before check-in." + exit_on_error "updating repository; this issue should be fixed before check-in." pushd "$directory" &>/dev/null if [ -f ".no-checkin" ]; then @@ -371,6 +371,7 @@ function do_careful_git_update() if [ ! -d ".git" ]; then # not a git project, so just boil this down to a getem action. popd &>/dev/null +echo "special case; not doing careful git update on non git repository: $directory" do_update "$directory" return $? fi @@ -438,7 +439,7 @@ function do_update() if [ $nicedir == "." ]; then nicedir=$(\pwd) fi - local blatt="echo retrieving '$nicedir'..." + local blatt="echo -e \nretrieving '$nicedir'..." pushd "$directory" &>/dev/null if [ -d "CVS" ]; then -- 2.34.1