From 90650c7e1cd4e52cda4708c387f1eee1e7df00f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 18 Sep 2008 23:50:22 +0300 Subject: [PATCH] Fix svn errors --- update.sh | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/update.sh b/update.sh index 2a5e9e5..3192302 100755 --- a/update.sh +++ b/update.sh @@ -37,12 +37,12 @@ if [ ! $MSGINIT ]; then exit 1 fi -if [ $GIT ] && [ ! $GITSVN ]; then +if [ $GIT -eq 1 ] && [ ! $GITSVN ]; then echo -e "\E[31mgit-svn is unavailable. svn will be used."; tput sgr0 GIT=0 fi -if [ $GIT ] && [ $GITSVN ]; then +if [ $GIT -eq 1 ] && [ $GITSVN ]; then SVN="$GITSVN clone" fi @@ -52,17 +52,16 @@ echo "" if [ ! -z $TRUNK ]; then if [ -e $TRUNK/.git ] || [ -e $TRUNK/.svn ]; then echo -e "Updating repository: \E[34mtrunk" - if [ $GIT ] && [ $GITSVN ]; then - SVN="$GITSVN rebase" - else - SVN="$SVN update" - fi cd $TRUNK - $SVN "$REPO/$TRUNK/po" + if [ $GIT -eq 1 ]; then + $GITSVN rebase + else + $SVN update + fi cd .. else echo -e "Downloading repository: \E[34mtrunk" - if [ $GIT ] && [ $GITSVN ]; then + if [ $GIT -eq 1 ]; then SVN="$GITSVN clone" else SVN="$SVN checkout" @@ -78,17 +77,16 @@ fi for BRANCH in $BRANCHES; do if [ -e $BRANCH/.git ] || [ -e $BRANCH/.svn ]; then echo -e "Updating repository: \E[34m$BRANCH" - if [ $GIT ] && [ $GITSVN ]; then - SVN="$GITSVN rebase" - else - SVN="$SVN update" - fi cd $BRANCH - $SVN "$REPO/$BRANCH/po" + if [ $GIT -eq 1 ]; then + $GITSVN rebase + else + $SVN update + fi cd .. else echo -e "Downloading repository: \E[34m$BRANCH" - if [ $GIT ] && [ $GITSVN ]; then + if [ $GIT -eq 1 ]; then SVN="$GITSVN clone" else SVN="$SVN checkout"