mirror of
https://github.com/crater-invoice/crater.git
synced 2025-10-27 19:51:09 -04:00
refactor updater
This commit is contained in:
@ -17,14 +17,14 @@ class Listener
|
||||
protected function check($event)
|
||||
{
|
||||
// Apply only to the specified alias
|
||||
if ($event->alias != static::ALIAS) {
|
||||
return false;
|
||||
}
|
||||
// if ($event->alias != static::ALIAS) {
|
||||
// return false;
|
||||
// }
|
||||
|
||||
// Do not apply to the same or newer versions
|
||||
if (version_compare($event->old, static::VERSION, '>=')) {
|
||||
return false;
|
||||
}
|
||||
// if (version_compare($event->old, static::VERSION, '>=')) {
|
||||
// return false;
|
||||
// }
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -6,6 +6,8 @@ use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Queue\InteractsWithQueue;
|
||||
use Laraspace\Listeners\Updates\Listener;
|
||||
use Laraspace\Events\UpdateFinished;
|
||||
use Illuminate\Support\Facades\Artisan;
|
||||
use Laraspace\Setting;
|
||||
|
||||
class Version101 extends Listener
|
||||
{
|
||||
@ -21,8 +23,12 @@ class Version101 extends Listener
|
||||
*/
|
||||
public function handle(UpdateFinished $event)
|
||||
{
|
||||
if (!$this->check($event)) {
|
||||
return;
|
||||
}
|
||||
// if (!$this->check($event)) {
|
||||
// return;
|
||||
// }
|
||||
|
||||
Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]);
|
||||
|
||||
Setting::getSetting('version', self::VERSION);
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,6 +4,8 @@ namespace Laraspace\Providers;
|
||||
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
|
||||
use Illuminate\Auth\Events\Registered;
|
||||
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
|
||||
use Laraspace\Events\UpdateFinished;
|
||||
use Laraspace\Listeners\Updates\V10\Version101;
|
||||
|
||||
class EventServiceProvider extends ServiceProvider
|
||||
{
|
||||
@ -13,8 +15,8 @@ class EventServiceProvider extends ServiceProvider
|
||||
* @var array
|
||||
*/
|
||||
protected $listen = [
|
||||
'Laraspace\Events\UpdateFinished' => [
|
||||
'Laraspace\Listeners\Updates\V10\Version101',
|
||||
UpdateFinished::class=> [
|
||||
Version101::class,
|
||||
],
|
||||
Registered::class => [
|
||||
SendEmailVerificationNotification::class,
|
||||
|
||||
@ -68,16 +68,16 @@ class Updater
|
||||
// Delete zip file
|
||||
File::delete($file);
|
||||
|
||||
if (!File::copyDirectory($temp_path2, base_path())) {
|
||||
if (!File::copyDirectory($temp_path2.'/test', base_path())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Delete temp directory
|
||||
File::deleteDirectory($temp_path);
|
||||
File::deleteDirectory($temp_path2);
|
||||
|
||||
event(new UpdateFinished($alias, $installed, $version));
|
||||
try {
|
||||
event(new UpdateFinished($alias, $installed, $version));
|
||||
// event(new UpdateFinished($alias, $installed, $version));
|
||||
|
||||
return [
|
||||
'success' => true,
|
||||
|
||||
Reference in New Issue
Block a user