From 236c4adaa57e7775938dc98821f5fe971cc91ce3 Mon Sep 17 00:00:00 2001 From: fake Date: Wed, 7 Jun 2006 08:32:09 +0000 Subject: [PATCH] fake: Update-Src: bless with some more knowledge, fixing flyspray task #29 (fixed exit after svn up) [2006051512303819678] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7606 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Update-Src | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/scripts/Update-Src b/scripts/Update-Src index e402d7427..d13cab773 100755 --- a/scripts/Update-Src +++ b/scripts/Update-Src @@ -51,13 +51,28 @@ while [ "$1" ] ; do shift done -cmd="rsync -rltzv --delete" -for x in Documentation architecture package misc scripts target -do cmd="$cmd --include='/$x' --include='/$x/**'"; done -cmd="$cmd --exclude='*' $srcroot ." +if [ -L scripts ] ; then + echo "Update-Src shouldn't be run in a linked source tree." + exit 1; +fi -echo "Running '$cmd' ..." -eval "$cmd" +if [ -d .svn ] ; then + if [ -d ../`basename $PWD`.sm/SM ] ; then + echo "This looks like a submaster tree. Please update it using sm sync!" + exit 1 + fi + + echo "Running 'svn up' ..." + svn up +else + cmd="rsync -rltzv --delete" + for x in Documentation architecture package misc scripts target + do cmd="$cmd --include='/$x' --include='/$x/**'"; done + cmd="$cmd --exclude='*' $srcroot ." + + echo "Running '$cmd' ..." + eval "$cmd" +fi echo echo "You might need to run ./scripts/Download now."