andrius
/
wesnoth-l10n-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix svn errors

This commit is contained in:
Andrius Štikonas 2008-09-18 23:50:22 +03:00
parent c1f12f6fb8
commit 90650c7e1c
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
update.sh
View File

@ -37,12 +37,12 @@ if [ ! $MSGINIT ]; then
exit 1 exit 1
fi fi
if [ $GIT ] && [ ! $GITSVN ]; then if [ $GIT -eq 1 ] && [ ! $GITSVN ]; then
echo -e "\E[31mgit-svn is unavailable. svn will be used."; tput sgr0 echo -e "\E[31mgit-svn is unavailable. svn will be used."; tput sgr0
GIT=0 GIT=0
fi fi
if [ $GIT ] && [ $GITSVN ]; then if [ $GIT -eq 1 ] && [ $GITSVN ]; then
SVN="$GITSVN clone" SVN="$GITSVN clone"
fi fi
@ -52,17 +52,16 @@ echo ""
if [ ! -z $TRUNK ]; then if [ ! -z $TRUNK ]; then
if [ -e $TRUNK/.git ] || [ -e $TRUNK/.svn ]; then if [ -e $TRUNK/.git ] || [ -e $TRUNK/.svn ]; then
echo -e "Updating repository: \E[34mtrunk" echo -e "Updating repository: \E[34mtrunk"
if [ $GIT ] && [ $GITSVN ]; then
SVN="$GITSVN rebase"
else
SVN="$SVN update"
fi
cd $TRUNK cd $TRUNK
$SVN "$REPO/$TRUNK/po" if [ $GIT -eq 1 ]; then
$GITSVN rebase
else
$SVN update
fi
cd .. cd ..
else else
echo -e "Downloading repository: \E[34mtrunk" echo -e "Downloading repository: \E[34mtrunk"
if [ $GIT ] && [ $GITSVN ]; then if [ $GIT -eq 1 ]; then
SVN="$GITSVN clone" SVN="$GITSVN clone"
else else
SVN="$SVN checkout" SVN="$SVN checkout"
@ -78,17 +77,16 @@ fi
for BRANCH in $BRANCHES; do for BRANCH in $BRANCHES; do
if [ -e $BRANCH/.git ] || [ -e $BRANCH/.svn ]; then if [ -e $BRANCH/.git ] || [ -e $BRANCH/.svn ]; then
echo -e "Updating repository: \E[34m$BRANCH" echo -e "Updating repository: \E[34m$BRANCH"
if [ $GIT ] && [ $GITSVN ]; then
SVN="$GITSVN rebase"
else
SVN="$SVN update"
fi
cd $BRANCH cd $BRANCH
$SVN "$REPO/$BRANCH/po" if [ $GIT -eq 1 ]; then
$GITSVN rebase
else
$SVN update
fi
cd .. cd ..
else else
echo -e "Downloading repository: \E[34m$BRANCH" echo -e "Downloading repository: \E[34m$BRANCH"
if [ $GIT ] && [ $GITSVN ]; then if [ $GIT -eq 1 ]; then
SVN="$GITSVN clone" SVN="$GITSVN clone"
else else
SVN="$SVN checkout" SVN="$SVN checkout"