Commit 2657e367 authored by Son Nguyen's avatar Son Nguyen

Add 1.6 branch for language packs

Signed-off-by: default avatarSon Nguyen <son.nguyen@catalyst.net.nz>
parent 292b3193
...@@ -109,7 +109,7 @@ system "git fetch --quiet origin"; ...@@ -109,7 +109,7 @@ system "git fetch --quiet origin";
# For launchpad, all languages are in a single branch, so update the lot # For launchpad, all languages are in a single branch, so update the lot
! -d $BZRDIR && system "bzr init-repo $BZRDIR"; ! -d $BZRDIR && system "bzr init-repo $BZRDIR";
my @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE master); my @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE master);
foreach my $branch (@branches) { foreach my $branch (@branches) {
if ( ! -d "$BZRDIR/$branch" ) { if ( ! -d "$BZRDIR/$branch" ) {
...@@ -143,14 +143,14 @@ foreach my $lang (@langkeys) { ...@@ -143,14 +143,14 @@ foreach my $lang (@langkeys) {
if ( $remote =~ m/^lp:mahara-lang/ ) { if ( $remote =~ m/^lp:mahara-lang/ ) {
$repotype = 'launchpad'; $repotype = 'launchpad';
@branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE master); @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE master);
} }
elsif ( $remote =~ m{^git://gitorious\.org} ) { elsif ( $remote =~ m{^git://gitorious\.org} ) {
$repotype = 'gitorious'; $repotype = 'gitorious';
! -d "$gitlangdir" && system "git clone --quiet $remote $gitlangdir"; ! -d "$gitlangdir" && system "git clone --quiet $remote $gitlangdir";
chdir $gitlangdir; chdir $gitlangdir;
system "git fetch --quiet"; system "git fetch --quiet";
my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|1.3_STABLE\|1.4_STABLE\|1.5_STABLE\)$"'; my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|1.3_STABLE\|1.4_STABLE\|1.5_STABLE|1.6_STABLE\)$"';
my $remotebranches = `$remotebranchcmd`; my $remotebranches = `$remotebranchcmd`;
$remotebranches =~ s/\s+/ /; $remotebranches =~ s/\s+/ /;
@branches = (); @branches = ();
......
...@@ -40,7 +40,7 @@ BZR=${WORK}/mahara-lang-bzr ...@@ -40,7 +40,7 @@ BZR=${WORK}/mahara-lang-bzr
cd ${GITDIR} cd ${GITDIR}
git fetch --quiet origin git fetch --quiet origin
branches="1.3_STABLE 1.4_STABLE 1.5_STABLE master" branches="1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE master"
for branch in ${branches} ; do for branch in ${branches} ; do
branchexists=`git branch | grep "${branch}$"` branchexists=`git branch | grep "${branch}$"`
...@@ -179,4 +179,4 @@ for branch in ${branches} ; do ...@@ -179,4 +179,4 @@ for branch in ${branches} ; do
echo "${remotecommit}" > ${last} echo "${remotecommit}" > ${last}
fi fi
done done
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment