Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 16:14:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up for Self Updater

Browse Source
This commit is contained in:
David Bomba 2023-05-02 20:23:29 +10:00
parent 45bcbe85cb
commit a2a777a12b
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,6 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Exceptions\FilePermissionsFailure; use App\Exceptions\FilePermissionsFailure;
use App\Models\Client;
use App\Utils\Ninja; use App\Utils\Ninja;
use App\Utils\Traits\AppSetup; use App\Utils\Traits\AppSetup;
use App\Utils\Traits\ClientGroupSettingsSaver; use App\Utils\Traits\ClientGroupSettingsSaver;
@ -67,7 +66,8 @@ class SelfUpdateController extends BaseController
nlog('Finished copying'); nlog('Finished copying');
// $file = Storage::disk('local')->path('invoiceninja.zip'); // $file = Storage::disk('local')->path('invoiceninja.zip');
$file = Storage::disk('local')->path('invoiceninja.tar'); $file = Storage::disk('local')->path('invoiceninja.tar');
nlog('Extracting zip'); nlog('Extracting zip');
@ -111,40 +111,40 @@ class SelfUpdateController extends BaseController
return response()->json(['message' => 'Update completed'], 200); return response()->json(['message' => 'Update completed'], 200);
} }
private function deleteDirectory($dir) // private function deleteDirectory($dir)
{ // {
if (! file_exists($dir)) { // if (! file_exists($dir)) {
return true; // return true;
} // }
if (! is_dir($dir) || is_link($dir)) { // if (! is_dir($dir) || is_link($dir)) {
return unlink($dir); // return unlink($dir);
} // }
foreach (scandir($dir) as $item) { // foreach (scandir($dir) as $item) {
if ($item == '.' || $item == '..') { // if ($item == '.' || $item == '..') {
continue; // continue;
} // }
if (! $this->deleteDirectory($dir.'/'.$item)) { // if (! $this->deleteDirectory($dir.'/'.$item)) {
if (! $this->deleteDirectory($dir.'/'.$item)) { // if (! $this->deleteDirectory($dir.'/'.$item)) {
return false; // return false;
} // }
} // }
} // }
return rmdir($dir); // return rmdir($dir);
} // }
private function postHookUpdate() // private function postHookUpdate()
{ // {
if (config('ninja.app_version') == '5.3.82') { // if (config('ninja.app_version') == '5.3.82') {
Client::withTrashed()->cursor()->each(function ($client) { // Client::withTrashed()->cursor()->each(function ($client) {
$entity_settings = $this->checkSettingType($client->settings); // $entity_settings = $this->checkSettingType($client->settings);
$entity_settings->md5 = md5(time()); // $entity_settings->md5 = md5(time());
$client->settings = $entity_settings; // $client->settings = $entity_settings;
$client->save(); // $client->save();
}); // });
} // }
} // }
private function clearCacheDir() private function clearCacheDir()
{ {
@ -167,10 +167,10 @@ class SelfUpdateController extends BaseController
} }
if ($file->isFile() && ! $file->isWritable()) { if ($file->isFile() && ! $file->isWritable()) {
nlog("Cannot update system because {$file->getFileName()} is not writable"); nlog("Cannot update system because {$file->getFileName()} is not writable");
throw new FilePermissionsFailure("Cannot update system because {$file->getFileName()} is not writable"); throw new FilePermissionsFailure("Cannot update system because {$file->getFileName()} is not writable");
return false;
} }
} }
@ -189,6 +189,6 @@ class SelfUpdateController extends BaseController
$version = $this->checkVersion(); $version = $this->checkVersion();
return "https://github.com/invoiceninja/invoiceninja/releases/download/v{$version}/invoiceninja.tar"; return "https://github.com/invoiceninja/invoiceninja/releases/download/v{$version}/invoiceninja.tar";
return "https://github.com/invoiceninja/invoiceninja/releases/download/v{$version}/invoiceninja.zip"; // return "https://github.com/invoiceninja/invoiceninja/releases/download/v{$version}/invoiceninja.zip";
} }
} }