joomla/weblinks
30
1
Fork 0
mirror of https://github.com/joomla-extensions/weblinks.git synced 2024-06-01 05:50:52 +00:00
Code Issues Releases Activity

Merge pull request #132 from compojoom/curl_insecure

Browse Source 
the --insecure option was set to git, but it should be set at curl
This commit is contained in:
Viktor Vogel 2015-10-31 11:34:19 +01:00
commit a25d3540af
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RoboFile.php
View File

@ -234,9 +234,8 @@ class RoboFile extends \Robo\Tasks
private function buildGitCloneCommand() private function buildGitCloneCommand()
{ {
$branch = empty($this->configuration->branch) ? 'staging' : $this->configuration->branch; $branch = empty($this->configuration->branch) ? 'staging' : $this->configuration->branch;
$insecure = $this->isWindows() ? ' --insecure' : '';
return "git" . $this->extension . " clone -b $branch $insecure --single-branch --depth 1 https://github.com/joomla/joomla-cms.git tests/cache"; return "git" . $this->extension . " clone -b $branch --single-branch --depth 1 https://github.com/joomla/joomla-cms.git tests/cache";
} }
/** /**
@ -308,7 +307,8 @@ class RoboFile extends \Robo\Tasks
// Make sure we have Composer // Make sure we have Composer
if (!file_exists('./composer.phar')) if (!file_exists('./composer.phar'))
{ {
$this->_exec('curl --retry 3 --retry-delay 5 -sS https://getcomposer.org/installer | php'); $insecure = $this->isWindows() ? ' --insecure' : '';
$this->_exec('curl ' . $insecure . ' --retry 3 --retry-delay 5 -sS https://getcomposer.org/installer | php');
} }
} }