From a44877529330e6a8defe9699ebdd51446c2f3006 Mon Sep 17 00:00:00 2001 From: Aaron Wells Date: Thu, 7 May 2015 17:56:16 +1200 Subject: [PATCH] Removing all the remaining gitorious references --- debian/custom-site-mahara-langpacks.templates | 2 +- mahara-langpacks/langpacks.pl | 18 +++++++++--------- mahara-langpacks/language-repos.txt | 4 ++-- mahara-langpacks/update-po.sh | 4 ++-- mahara-langpacks/update-pot.sh | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/custom-site-mahara-langpacks.templates b/debian/custom-site-mahara-langpacks.templates index 336c742..1a7ae14 100644 --- a/debian/custom-site-mahara-langpacks.templates +++ b/debian/custom-site-mahara-langpacks.templates @@ -1,6 +1,6 @@ Template: custom-site-mahara-langpacks/projdir Type: string -Default: git://gitorious.org/mahara-lang +Default: git@git.nzoss.org.nz:mahara/mahara-lang.git Description: Project location The git repository to get the langpacks from diff --git a/mahara-langpacks/langpacks.pl b/mahara-langpacks/langpacks.pl index 7fd8f47..a4f75ba 100644 --- a/mahara-langpacks/langpacks.pl +++ b/mahara-langpacks/langpacks.pl @@ -40,8 +40,8 @@ my $CLEAN = "${DATA}/new"; my $TARBALLS = "${DATA}/tarballs"; my $MAHARA = "${DATA}/mahara"; -my $MAHARAREMOTE = 'git://gitorious.org/mahara/mahara.git'; -my $REPOLIST = 'http://gitorious.org/mahara/mahara-scripts/blobs/raw/master/mahara-langpacks/language-repos.txt'; +my $MAHARAREMOTE = 'git@github.com:MaharaProject/mahara.git'; +my $REPOLIST = 'https://git.nzoss.org.nz/mahara/mahara-scripts/blob/master/mahara-langpacks/language-repos.txt'; mkpath $GITDIR; mkpath $DIRTY; @@ -51,7 +51,7 @@ mkpath $TARBALLS; print STDERR "Checking langpacks for updates: " . `date \"+%Y-%m-%d %H:%M:%S\"`; # A language repo list can be put in the $DATA dir for testing. If there's not one -# there, try to get an up-to-date one out of the gitorious mahara-scripts repo +# there, try to get an up-to-date one out of the mahara-scripts repository # (allows updates to the repo list without having to redeploy the package). my $repolist; if ( -f "$SCRIPTS/language-repos.txt" ) { @@ -125,7 +125,7 @@ foreach my $branch (@branches) { foreach my $lang (@langkeys) { if ( ! defined $last->{$lang} ) { - $last->{$lang} = { repo => "git://gitorious.org/mahara-lang/$lang.git" }; + $last->{$lang} = { repo => "git@git.nzoss.org.nz:mahara-lang/$lang.git" }; } if ( defined $langs{$lang}->{repo} ) { @@ -146,8 +146,8 @@ foreach my $lang (@langkeys) { $repotype = 'launchpad'; @branches = qw(1.7_STABLE 1.8_STABLE 1.9_STABLE 1.10_STABLE 15.04_STABLE master); } - elsif ( $remote =~ m{^git://gitorious\.org} ) { - $repotype = 'gitorious'; + elsif ( $remote =~ m{^git@git\.nzoss\.org\.nz} ) { + $repotype = 'git'; ! -d "$gitlangdir" && system "git clone --quiet $remote $gitlangdir"; chdir $gitlangdir; system "git fetch --quiet"; @@ -204,7 +204,7 @@ foreach my $lang (@langkeys) { if ( "$remotecommit" ne "$lastruncommit" ) { print STDERR "Updating $lang $branch\n"; - if ( $repotype eq 'gitorious' ) { + if ( $repotype eq 'git' ) { my $branchcmd = 'git branch | grep "' . $branch . '$"'; my $branchexists = `$branchcmd`; @@ -250,7 +250,7 @@ foreach my $lang (@langkeys) { } } - elsif ( $repotype eq 'gitorious' ) { + elsif ( $repotype eq 'git' ) { # .po is not available, so this is a php langpack @@ -329,7 +329,7 @@ foreach my $lang (@langkeys) { chdir $currentdir; my $localcommit; - if ( $repotype eq 'gitorious' ) { + if ( $repotype eq 'git' ) { $localcommit = `git log --pretty=format:\"%H %ai %an\" $branch | head -1`; } else { diff --git a/mahara-langpacks/language-repos.txt b/mahara-langpacks/language-repos.txt index 39c4bf3..6902f81 100644 --- a/mahara-langpacks/language-repos.txt +++ b/mahara-langpacks/language-repos.txt @@ -1,11 +1,11 @@ ar lp:mahara-lang ca lp:mahara-lang -cs git://gitorious.org/mahara-lang/cs.git +cs git@git.nzoss.org.nz:mahara-lang/cs.git da lp:mahara-lang de lp:mahara-lang el lp:mahara-lang en_GB lp:mahara-lang -en_us git://gitorious.org/mahara-lang/en_us.git +en_us git@git.nzoss.org.nz:mahara-lang/en_us.git es lp:mahara-lang eu lp:mahara-lang fi lp:mahara-lang diff --git a/mahara-langpacks/update-po.sh b/mahara-langpacks/update-po.sh index 631b21b..5a56734 100755 --- a/mahara-langpacks/update-po.sh +++ b/mahara-langpacks/update-po.sh @@ -22,14 +22,14 @@ PHPSCRIPT=${HOME}/mahara-scripts/mahara-langpacks/php-po.php [ ! -d ${GITDIR} ] && mkdir ${GITDIR} [ ! -d ${OUT} ] && mkdir ${OUT} -mahararemote='git://gitorious.org/mahara/mahara.git' +mahararemote='git@github.com:MaharaProject/mahara.git' if [ ! -d ${MAHARA} ] ; then cd ${WORK} git clone ${mahararemote} ${MAHARA} fi -langremotebase='git://gitorious.org/mahara-lang' +langremotebase='git@git.nzoss.org.nz:mahara-lang/' langs="ca cs da de en_us es eu fi fr he it ja ko nl no_nb sl zh_tw" for lang in ${langs} ; do diff --git a/mahara-langpacks/update-pot.sh b/mahara-langpacks/update-pot.sh index 4f6316a..42122fc 100755 --- a/mahara-langpacks/update-pot.sh +++ b/mahara-langpacks/update-pot.sh @@ -32,7 +32,7 @@ TEMP=${WORK}/temp [ ! -d ${TEMP} ] && mkdir ${TEMP} [ ! -d ${DOCROOT}/pot ] && mkdir ${DOCROOT}/pot -#mahararemote='git://gitorious.org/mahara/mahara.git' +#mahararemote='git@git.nzoss.org.nz/mahara/mahara.git' mahararemote='git@github.com:MaharaProject/mahara.git' if [ ! -d ${GITDIR} ]; then -- GitLab