aboutsummaryrefslogtreecommitdiff
path: root/scripts/auto-build
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2012-12-20 19:03:07 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2012-12-20 19:03:07 +0000
commitd018147ae125f7e817399bddddbf125dbc4e1b01 (patch)
tree328cbb7e51e45d8878de3ff4b148b47ff3634e19 /scripts/auto-build
parente95fe841b2994d3e36a88f676d29857ab552073b (diff)
fix clean_and_update_folder() for when its run in MSYS using Cygwin's svn
svn path=/trunk/; revision=16719
Diffstat (limited to 'scripts/auto-build')
-rw-r--r--scripts/auto-build/auto-build-common9
1 files 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
}