Browse Source

Fix svn errors

master
Andrius Štikonas 12 years ago
parent
commit
90650c7e1c
1 changed files with 12 additions and 14 deletions
  1. +12
    -14
      update.sh

+ 12
- 14
update.sh View File

@@ -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"
cd $TRUNK
if [ $GIT -eq 1 ]; then
$GITSVN rebase
else
SVN="$SVN update"
$SVN update
fi
cd $TRUNK
$SVN "$REPO/$TRUNK/po"
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"
cd $BRANCH
if [ $GIT -eq 1 ]; then
$GITSVN rebase
else
SVN="$SVN update"
$SVN update
fi
cd $BRANCH
$SVN "$REPO/$BRANCH/po"
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"


Loading…
Cancel
Save