From 8c0390143b847b1b8ed7b8b42d5a09aa2c0025df Mon Sep 17 00:00:00 2001 From: Jason Erb Date: Tue, 7 Mar 2017 18:08:11 -0500 Subject: =?UTF-8?q?Remove=20init-repository=20assumption=20of=20repo=20url?= =?UTF-8?q?=20=E2=80=9C=E2=80=A6/qt/=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-59355 Change-Id: I7bc2c94f13c6cf43bd9d4472f18b3b769e75954b Reviewed-by: Oswald Buddenhagen Reviewed-by: Edward Welbourne --- init-repository | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/init-repository b/init-repository index 7a97c199..570e124f 100755 --- a/init-repository +++ b/init-repository @@ -144,7 +144,7 @@ Options: For example: - --mirror user\@machine:/foo/bar/ + --mirror user\@machine:/foo/bar/qt/ ...will use the following as a mirror for qtbase: @@ -167,13 +167,13 @@ my $script_path = abs_path($0); $script_path =~ s,[/\\][^/\\]+$,,; my $GERRIT_SSH_BASE - = 'ssh://@USER@codereview.qt-project.org@PORT@/'; + = 'ssh://@USER@codereview.qt-project.org@PORT@/qt/'; my $BER_MIRROR_URL_BASE - = 'git://hegel/'; + = 'git://hegel/qt/'; my $OSLO_MIRROR_URL_BASE - = 'git://qilin/'; + = 'git://qilin/qt/'; sub new { @@ -638,12 +638,12 @@ sub run chomp(my $url = `git config remote.origin.url`); die("Have no origin remote.\n") if (!$url); $url =~ s,\.git$,,; - $url =~ s,qt/qt5$,,; + $url =~ s/qt5$//; $self->{'base-url'} = $url; - $self->git_clone_all_submodules('qt/qt5', $self->{branch}, @{$self->{'module-subset'}}); + $self->git_clone_all_submodules('qt5', $self->{branch}, @{$self->{'module-subset'}}); - $self->git_add_remotes('qt/qt5'); + $self->git_add_remotes('qt5'); $self->git_install_hooks; -- cgit v1.2.3