From ef96e4d32e6108effa8697c22927894ea9f0631d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 13 Dec 2012 20:12:40 +0000 Subject: update remove_dead_svn_externals to work in MSYS when using Cygwin svn svn path=/trunk/; revision=16685 --- scripts/auto-build/auto-build-common | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/auto-build/auto-build-common b/scripts/auto-build/auto-build-common index d3fa2790..10f39d96 100644 --- a/scripts/auto-build/auto-build-common +++ b/scripts/auto-build/auto-build-common @@ -108,13 +108,14 @@ find_svn() remove_dead_svn_externals() { + cd "$1" svn=$(find_svn) - svn_externals=`$svn propget -R svn:externals "$1" | sed 's|^.* - ||' | awk '{print $1}'` - for external in `$svn status --no-ignore "$1" | grep '^[X]' | awk '{print $2}'`; do + svn_externals=`$svn propget -R svn:externals . | sed 's|^.* - ||' | awk '{print $1}'` + for external in `$svn status --no-ignore . | grep '^[X]' | awk '{print $2}'`; do name=$(basename $external) if [ -z "$(echo $svn_externals | grep $name)" ]; then - echo "Removing defunct svn:external '$name' at '$external'" - echo rm -rf "$external" + echo "TODO: remove defunct svn:external '$name' at '$external'" + $svn revert -R "$external" $svn update "$external" fi done -- cgit v1.2.1