Updated the Github URL to andysh-uk. Update script now downloads Composer, like the install script does.
This commit is contained in:
parent
e2d66fd228
commit
9064495f1f
@ -15,7 +15,7 @@ return [
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
'github' => [
|
'github' => [
|
||||||
'latest_release_url' => 'https://api.github.com/repos/pandy06269/blue-twilight/releases/latest'
|
'latest_release_url' => 'https://api.github.com/repos/andysh-uk/blue-twilight/releases/latest'
|
||||||
],
|
],
|
||||||
|
|
||||||
'recaptcha' => [
|
'recaptcha' => [
|
||||||
|
@ -65,6 +65,8 @@ php artisan clear-compiled
|
|||||||
<?php
|
<?php
|
||||||
$steps = [
|
$steps = [
|
||||||
['Removing compiled cache', 'removeCompiledCached'],
|
['Removing compiled cache', 'removeCompiledCached'],
|
||||||
|
['Fetching Composer signature', 'fetchComposerSignature'],
|
||||||
|
['Installing Composer', 'installComposer'],
|
||||||
['Updating dependencies using Composer', 'runComposer']
|
['Updating dependencies using Composer', 'runComposer']
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -92,6 +94,31 @@ php artisan clear-compiled
|
|||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function fetchComposerSignature()
|
||||||
|
{
|
||||||
|
if (!boolval(ini_get('allow_url_fopen')))
|
||||||
|
{
|
||||||
|
$this->echoError('allow_url_fopen is disabled so we cannot use Composer');
|
||||||
|
echo '<br/>';
|
||||||
|
$this->echoError('You will need to install the vendor libraries manually - <a href="https://github.com/pandy06269/blue-twilight/wiki/Install-Vendor-libraries-manually" target="_blank">see this page for more details</a>');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$signatureUrl = 'https://composer.github.io/installer.sig';
|
||||||
|
$this->composerSignature = trim(file_get_contents($signatureUrl));
|
||||||
|
if (strlen($this->composerSignature) == 0)
|
||||||
|
{
|
||||||
|
$this->echoError(sprintf("Failed downloading the Composer signature from %s", $signatureUrl));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->echoOK($this->composerSignature);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
private function removeCompiledCached()
|
private function removeCompiledCached()
|
||||||
{
|
{
|
||||||
ob_start();
|
ob_start();
|
||||||
@ -155,6 +182,55 @@ php artisan clear-compiled
|
|||||||
echo '</span>' . PHP_EOL;
|
echo '</span>' . PHP_EOL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function installComposer()
|
||||||
|
{
|
||||||
|
$rc = -1;
|
||||||
|
|
||||||
|
ob_start();
|
||||||
|
system('php -r "copy(\'https://getcomposer.org/installer\', \'composer-setup.php\');"', $rc);
|
||||||
|
$result = ob_get_clean();
|
||||||
|
echo nl2br($result);
|
||||||
|
|
||||||
|
if ($rc != 0)
|
||||||
|
{
|
||||||
|
$this->echoError('Failed to fetch Composer');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
ob_start();
|
||||||
|
system(sprintf('php -r "if (hash_file(\'SHA384\', \'composer-setup.php\') === \'%s\') { echo \'Installer verified\'; } else { echo \'Installer corrupt\'; unlink(\'composer-setup.php\'); } echo PHP_EOL;"', $this->composerSignature), $rc);
|
||||||
|
$result = ob_get_clean();
|
||||||
|
echo nl2br($result);
|
||||||
|
if ($rc != 0)
|
||||||
|
{
|
||||||
|
$this->echoError('Composer verification failed');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
ob_start();
|
||||||
|
system('php composer-setup.php', $rc);
|
||||||
|
$result = ob_get_clean();
|
||||||
|
echo nl2br($result);
|
||||||
|
if ($rc != 0)
|
||||||
|
{
|
||||||
|
$this->echoError('Failed to install Composer');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
ob_start();
|
||||||
|
system('php -r "unlink(\'composer-setup.php\');"', $rc);
|
||||||
|
$result = ob_get_clean();
|
||||||
|
echo nl2br($result);
|
||||||
|
if ($rc != 0)
|
||||||
|
{
|
||||||
|
$this->echoError('Failed to remove Composer setup file');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->echoOK();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
private function runComposer()
|
private function runComposer()
|
||||||
{
|
{
|
||||||
ob_start();
|
ob_start();
|
||||||
|
Loading…
Reference in New Issue
Block a user