From d018147ae125f7e817399bddddbf125dbc4e1b01 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 20 Dec 2012 19:03:07 +0000 Subject: fix clean_and_update_folder() for when its run in MSYS using Cygwin's svn svn path=/trunk/; revision=16719 --- scripts/auto-build/auto-build-common | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/auto-build/auto-build-common b/scripts/auto-build/auto-build-common index 10f39d96..9ae037a3 100644 --- a/scripts/auto-build/auto-build-common +++ b/scripts/auto-build/auto-build-common @@ -123,14 +123,13 @@ remove_dead_svn_externals() clean_and_update_folder() { - folder=$1 - cd $folder - if [ -d $folder/.git ]; then + cd "$1" + if [ -d ".git" ]; then git=$(find_git) $git reset --hard $git clean -fdx $git pull - elif [ -d $folder/.svn ]; then + elif [ -d ".svn" ]; then svn=$(find_svn) $svn cleanup . $svn revert -R . @@ -141,7 +140,7 @@ clean_and_update_folder() $svn update $svn update -N . else - echo "no cleaning done, unknown SCM" + echo "no cleaning or updating done, unknown SCM" fi } -- cgit v1.2.1