Git-svn support moved to git-support branch.
This commit is contained in:
parent
0cfa3d497b
commit
baf9ae3215
43
update.sh
43
update.sh
|
@ -37,36 +37,18 @@ if [ ! $MSGINIT ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $GIT -eq 1 ] && [ ! $GITSVN ]; then
|
|
||||||
echo -e $RED"git-svn is unavailable. svn will be used."$ENDCOLOR
|
|
||||||
GIT=0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $GIT -eq 1 ] && [ $GITSVN ]; then
|
|
||||||
SVN="$GITSVN clone"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo -e "Language: $RED$LCODE"$ENDCOLOR
|
echo -e "Language: $RED$LCODE"$ENDCOLOR
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
if [ ! -z $TRUNK ]; then
|
if [ ! -z $TRUNK ]; then
|
||||||
if [ -e $TRUNK/.git ] || [ -e $TRUNK/.svn ]; then
|
if [ -e $TRUNK/.svn ]; then
|
||||||
echo -e "Updating repository: "$BLUE"trunk"
|
echo -e "Updating repository: "$BLUE"trunk"
|
||||||
cd $TRUNK
|
cd $TRUNK
|
||||||
if [ $GIT -eq 1 ]; then
|
$SVN update
|
||||||
$GITSVN rebase
|
|
||||||
else
|
|
||||||
$SVN update
|
|
||||||
fi
|
|
||||||
cd ..
|
cd ..
|
||||||
else
|
else
|
||||||
echo -e "Downloading repository: "$BLUE"trunk"
|
echo -e "Checking out repository: "$BLUE"trunk"
|
||||||
if [ $GIT -eq 1 ]; then
|
$SVN checkout "$REPO/$TRUNK/po" $TRUNK
|
||||||
SVN="$GITSVN clone"
|
|
||||||
else
|
|
||||||
SVN="$SVN checkout"
|
|
||||||
fi
|
|
||||||
$SVN "$REPO/$TRUNK/po" $TRUNK
|
|
||||||
fi
|
fi
|
||||||
tput sgr0
|
tput sgr0
|
||||||
if [ ! -e "$PREFIX-$TRUNK" ]; then
|
if [ ! -e "$PREFIX-$TRUNK" ]; then
|
||||||
|
@ -75,23 +57,14 @@ if [ ! -z $TRUNK ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for BRANCH in $BRANCHES; do
|
for BRANCH in $BRANCHES; do
|
||||||
if [ -e $BRANCH/.git ] || [ -e $BRANCH/.svn ]; then
|
if [ -e $BRANCH/.svn ]; then
|
||||||
echo -e "Updating repository: $BLUE$BRANCH"
|
echo -e "Updating repository: $BLUE$BRANCH"
|
||||||
cd $BRANCH
|
cd $BRANCH
|
||||||
if [ $GIT -eq 1 ]; then
|
$SVN update
|
||||||
$GITSVN rebase
|
|
||||||
else
|
|
||||||
$SVN update
|
|
||||||
fi
|
|
||||||
cd ..
|
cd ..
|
||||||
else
|
else
|
||||||
echo -e "Downloading repository: $BLUE$BRANCH"
|
echo -e "Checking out repository: $BLUE$BRANCH"
|
||||||
if [ $GIT -eq 1 ]; then
|
$SVN checkout "$REPO/branches/$BRANCH/po" $BRANCH
|
||||||
SVN="$GITSVN clone"
|
|
||||||
else
|
|
||||||
SVN="$SVN checkout"
|
|
||||||
fi
|
|
||||||
$SVN "$REPO/branches/$BRANCH/po" $BRANCH
|
|
||||||
fi
|
fi
|
||||||
tput sgr0
|
tput sgr0
|
||||||
if [ ! -e "$PREFIX-$BRANCH" ]; then
|
if [ ! -e "$PREFIX-$BRANCH" ]; then
|
||||||
|
|
|
@ -22,7 +22,6 @@ TRUNK="trunk" # "trunk" or ""
|
||||||
|
|
||||||
# Options
|
# Options
|
||||||
LCODE="lt" # Language code. Only 1 language is supported.
|
LCODE="lt" # Language code. Only 1 language is supported.
|
||||||
GIT=0 # Enable (1) or disable (0) git-svn.
|
|
||||||
|
|
||||||
#Paths
|
#Paths
|
||||||
MDIR="mo"
|
MDIR="mo"
|
||||||
|
@ -37,7 +36,6 @@ ISUTF8=`which isutf8 2> /dev/null`
|
||||||
TAR=`which tar 2> /dev/null`
|
TAR=`which tar 2> /dev/null`
|
||||||
BZIP2=`which bzip2 2> /dev/null`
|
BZIP2=`which bzip2 2> /dev/null`
|
||||||
DIFF=`which diff 2> /dev/null`
|
DIFF=`which diff 2> /dev/null`
|
||||||
GITSVN=`which git-svn 2> /dev/null`
|
|
||||||
|
|
||||||
#Colors
|
#Colors
|
||||||
RED="\033[0;31m"
|
RED="\033[0;31m"
|
||||||
|
|
Loading…
Reference in New Issue