Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 00:34:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for releases

Browse Source
This commit is contained in:
David Bomba 2023-05-02 20:33:48 +10:00
parent a2a777a12b
commit 1f75ca4a74
1 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/Http/Controllers/SelfUpdateController.php
View File

@ -25,6 +25,10 @@ class SelfUpdateController extends BaseController
use ClientGroupSettingsSaver; use ClientGroupSettingsSaver;
use AppSetup; use AppSetup;
private bool $use_tar = false;
private string $filename = 'invoiceninja.zip';
private array $purge_file_list = [ private array $purge_file_list = [
'bootstrap/cache/compiled.php', 'bootstrap/cache/compiled.php',
'bootstrap/cache/config.php', 'bootstrap/cache/config.php',
@ -47,6 +51,11 @@ class SelfUpdateController extends BaseController
return response()->json(['message' => ctrans('texts.self_update_not_available')], 403); return response()->json(['message' => ctrans('texts.self_update_not_available')], 403);
} }
if(request()->has('tar')) {
$this->use_tar = true;
$this->filename = 'invoiceninja.tar';
}
nlog('Test filesystem is writable'); nlog('Test filesystem is writable');
$this->testWritable(); $this->testWritable();
@ -58,7 +67,7 @@ class SelfUpdateController extends BaseController
nlog('copying release file'); nlog('copying release file');
// if (copy($this->getDownloadUrl(), storage_path('app/invoiceninja.zip'))) { // if (copy($this->getDownloadUrl(), storage_path('app/invoiceninja.zip'))) {
if (copy($this->getDownloadUrl(), storage_path('app/invoiceninja.tar'))) { if (copy($this->getDownloadUrl(), storage_path("app/{$this->filename}"))) {
nlog('Copied file from URL'); nlog('Copied file from URL');
} else { } else {
return response()->json(['message' => 'Download not yet available. Please try again shortly.'], 410); return response()->json(['message' => 'Download not yet available. Please try again shortly.'], 410);
@ -66,26 +75,21 @@ class SelfUpdateController extends BaseController
nlog('Finished copying'); nlog('Finished copying');
// $file = Storage::disk('local')->path('invoiceninja.zip'); if($this->use_tar) {
$file = Storage::disk('local')->path($this->filename);
$file = Storage::disk('local')->path('invoiceninja.tar'); nlog('Extracting tar');
nlog('Extracting zip'); $phar = new \PharData($file);
$phar->extractTo(base_path());
// $zipFile = new \PhpZip\ZipFile(); nlog('Finished extracting files');
// $zipFile->openFile($file);
// $zipFile->deleteFromName(".htaccess");
// $zipFile->rewrite();
// $zipFile->extractTo(base_path());
// $zipFile->close();
// $zipFile = null;
$phar = new \PharData($file);
$phar->extractTo(base_path());
nlog('Finished extracting files'); unlink($file);
}
unlink($file); else {
$this->extractUsingZip();
}
nlog('Deleted release zip file'); nlog('Deleted release zip file');
@ -111,6 +115,26 @@ class SelfUpdateController extends BaseController
return response()->json(['message' => 'Update completed'], 200); return response()->json(['message' => 'Update completed'], 200);
} }
private function extractUsingZip()
{
$file = Storage::disk('local')->path($this->filename);
nlog('Extracting zip');
$zipFile = new \PhpZip\ZipFile();
$zipFile->openFile($file);
$zipFile->deleteFromName(".htaccess");
$zipFile->rewrite();
$zipFile->extractTo(base_path());
$zipFile->close();
$zipFile = null;
unlink($file);
}
// private function deleteDirectory($dir) // private function deleteDirectory($dir)
// { // {
// if (! file_exists($dir)) { // if (! file_exists($dir)) {
@ -188,7 +212,10 @@ class SelfUpdateController extends BaseController
{ {
$version = $this->checkVersion(); $version = $this->checkVersion();
return "https://github.com/invoiceninja/invoiceninja/releases/download/v{$version}/invoiceninja.tar"; if(request()->has('tar'))
// return "https://github.com/invoiceninja/invoiceninja/releases/download/v{$version}/invoiceninja.zip"; return "https://github.com/invoiceninja/invoiceninja/releases/download/v{$version}/invoiceninja.tar";
return "https://github.com/invoiceninja/invoiceninja/releases/download/v{$version}/invoiceninja.zip";
} }
} }