Permalink
Browse files

Merge branch 'master' of git://github.com/saga-project/saga-deployments

  • Loading branch information...
andre-merzky committed Apr 26, 2012
2 parents 190d7ce + 453d21d commit 787258eb5913b03e3c3a7570a5e187e36c8dfadb
Showing with 13 additions and 3 deletions.
  1. +13 −3 csa_deploy.pl
View
@@ -95,6 +95,7 @@ (;$$)
my $ENV = `which env`; chomp ($ENV);
my $MAKE = "make --no-print-directory -f make.saga.csa.mk ";
my $giturl_orig = "https://github.com/saga-project/saga-deployments.git";
+my $giturl_pub = "git://github.com/saga-project/saga-deployments.git";
my $giturl = $giturl_orig;
my %csa_hosts = ();
my %csa_packs = ();
@@ -244,10 +245,19 @@ (;$$)
if ( $do_git_up )
{
- if ( ! $gituser ) { help (-1, "-g requires -u") }
- if ( ! $gitpass ) { help (-1, "-g requires -p") }
+ my $gitauth = "";
+ my $at = "";
- $giturl =~ s|^(https://)(.+)$|$1$gituser:$gitpass\@$2|io;
+ if ( $gitpass ) { $gitauth .= "$gitpass:"; $at = '@'; }
+ if ( $gituser ) { $gitauth .= "$gituser"; $at = '@'; }
+
+ $gitauth .= $at;
+
+ $giturl =~ s|^(https://)(.+)$|$1$gitauth$2|io;
+}
+else
+{
+ $giturl = $giturl_pub;
}
# {

0 comments on commit 787258e

Please sign in to comment.