Added skip backup on update option

Added skip backup on update option to config
This commit is contained in:
Julian Prieber 2022-05-30 11:39:39 +02:00
parent 5b73de7584
commit 54035ce5c4
3 changed files with 26 additions and 28 deletions

View File

@ -2,18 +2,9 @@
declare(strict_types=1); declare(strict_types=1);
$Vlocal = 'v' . file_get_contents(base_path("version.json"));
if (env('JOIN_BETA') == true) { if (env('JOIN_BETA') == true) {
$Vgit = file_get_contents("https://julianprieber.github.io/littlelink-custom/version.json"); $userver = 'https://beta.littlelink-custom.com/';
} else {
$Vgit = '0';
}
if ($Vgit > $Vlocal) {
$userver = 'https://update.littlelink-custom.com/';
} elseif (env('JOIN_BETA') == true) {
$userver = 'https://update.littlelink-custom.com/beta/';
} else { } else {
$userver = 'https://update.littlelink-custom.com/'; $userver = 'https://update.littlelink-custom.com/';
} }

View File

@ -4,10 +4,10 @@
<div class="container"> <div class="container">
<?php // Requests newest version from server and sets it as variable <?php // Requests newest version from server and sets it as variable
$Vgit = file_get_contents("https://julianprieber.github.io/littlelink-custom/version.json"); $Vgit = file_get_contents("https://julianprieber.github.io/littlelink-custom/version.json");
// Requests current version from the local version file and sets it as variable // Requests current version from the local version file and sets it as variable
$Vlocal = 'v' . file_get_contents(base_path("version.json")); $Vlocal = 'v' . file_get_contents(base_path("version.json"));
?> ?>
@if(auth()->user()->role == 'admin' and $Vgit > $Vlocal or env('JOIN_BETA') === true) @if(auth()->user()->role == 'admin' and $Vgit > $Vlocal or env('JOIN_BETA') === true)
@ -15,13 +15,13 @@
<?php //landing page ?> <?php //landing page ?>
<div class="logo-container fadein"> <div class="logo-container fadein">
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style=""> <img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
<div class="logo-centered">l</div> <div class="logo-centered">l</div>
</div> </div>
<h1>Updater</h1> <h1>Updater</h1>
@if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') @if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
<h4 class="">The updater only works on Linux based systems.</h4> <h4 class="">The updater only works on Linux based systems.</h4>
<a class="btn" href="https://littlelink-custom.com/update"><button style=""><i class="fa-solid fa-download btn"></i> Update manually</button></a> <a class="btn" href="https://littlelink-custom.com/update"><button><i class="fa-solid fa-download btn"></i> Update manually</button></a>
@else @else
@if(env('JOIN_BETA') === true) @if(env('JOIN_BETA') === true)
<p><?php echo "latest beta version= " . file_get_contents("https://update.littlelink-custom.com/beta/vbeta.json"); ?></p> <p><?php echo "latest beta version= " . file_get_contents("https://update.littlelink-custom.com/beta/vbeta.json"); ?></p>
@ -31,8 +31,12 @@
<h4 class="">You can update your installation automatically or download the update and install it manually:</h4> <h4 class="">You can update your installation automatically or download the update and install it manually:</h4>
@endif @endif
<br><div class="row"> <br><div class="row">
&ensp;<a class="btn" href="{{url()->current()}}/?backup"><button style=""><i class="fa-solid fa-user-gear btn"></i> Update automatically</button></a>&ensp; @if(env('SKIP_UPDATE_BACKUP') == true)
&ensp;<a class="btn" href="https://littlelink-custom.com/update"><button style=""><i class="fa-solid fa-download btn"></i> Update manually</button></a>&ensp; &ensp;<a class="btn" href="{{url()->current()}}/?updating"><button><i class="fa-solid fa-user-gear btn"></i> Update automatically</button></a>&ensp;
@else
&ensp;<a class="btn" href="{{url()->current()}}/?backup"><button><i class="fa-solid fa-user-gear btn"></i> Update automatically</button></a>&ensp;
@endif
&ensp;<a class="btn" href="https://littlelink-custom.com/update"><button><i class="fa-solid fa-download btn"></i> Update manually</button></a>&ensp;
</div> </div>
@endif @endif
@ -44,7 +48,7 @@
<meta http-equiv="refresh" content="2; URL={{url()->current()}}/?backups" /> <meta http-equiv="refresh" content="2; URL={{url()->current()}}/?backups" />
@endpush @endpush
<div class="logo-container fadein"> <div class="logo-container fadein">
<img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style=""> <img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
<div class="logo-centered">l</div> <div class="logo-centered">l</div>
</div> </div>
<h1 class="loadingtxt">Creating backup</h1> <h1 class="loadingtxt">Creating backup</h1>
@ -60,10 +64,10 @@ header("Location: ".$URL."?updating");
exit(); ?> exit(); ?>
@endif @endif
@if($_SERVER['QUERY_STRING'] === 'updating' and (file_exists(base_path("backups/CANUPDATE")))) @if($_SERVER['QUERY_STRING'] === 'updating' and (file_exists(base_path("backups/CANUPDATE")) or env('SKIP_UPDATE_BACKUP') == true))
<?php //updating... ?> <?php //updating... ?>
<div class="logo-container fadein"> <div class="logo-container fadein">
<img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style=""> <img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
<div class="logo-centered">l</div> <div class="logo-centered">l</div>
</div> </div>
<h1 class="loadingtxt">Updating</h1> <h1 class="loadingtxt">Updating</h1>
@ -76,13 +80,13 @@ exit(); ?>
<?php //success ?> <?php //success ?>
<div class="logo-container fadein"> <div class="logo-container fadein">
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style=""> <img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
<div class="logo-centered">l</div> <div class="logo-centered">l</div>
</div> </div>
<h1>No new version</h1> <h1>No new version</h1>
<h4 class="">There is no new version available</h4> <h4 class="">There is no new version available</h4>
<br><div class="row"> <br><div class="row">
&ensp;<a class="btn" href="{{ route('studioIndex') }}"><button style=""><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp; &ensp;<a class="btn" href="{{ route('studioIndex') }}"><button><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp;
</div> </div>
@endif @endif
@ -90,7 +94,7 @@ exit(); ?>
@if($_SERVER['QUERY_STRING'] === 'finishing') @if($_SERVER['QUERY_STRING'] === 'finishing')
<?php //updating... ?> <?php //updating... ?>
<div class="logo-container fadein"> <div class="logo-container fadein">
<img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style=""> <img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
<div class="logo-centered">l</div> <div class="logo-centered">l</div>
</div> </div>
<h1 class="loadingtxt">Finishing up</h1> <h1 class="loadingtxt">Finishing up</h1>
@ -101,6 +105,9 @@ exit(); ?>
if(EnvEditor::keyExists('JOIN_BETA')){ /* Do nothing if key already exists */ if(EnvEditor::keyExists('JOIN_BETA')){ /* Do nothing if key already exists */
} else { EnvEditor::addKey('JOIN_BETA', 'false');} // Adds key to .env file } else { EnvEditor::addKey('JOIN_BETA', 'false');} // Adds key to .env file
if(EnvEditor::keyExists('SKIP_UPDATE_BACKUP')){ /* Do nothing if key already exists */
} else { EnvEditor::addKey('SKIP_UPDATE_BACKUP', 'false');} // Adds key to .env file
echo "<meta http-equiv=\"refresh\" content=\"0; " . url()->current() . "?success\" />"; echo "<meta http-equiv=\"refresh\" content=\"0; " . url()->current() . "?success\" />";
?> ?>
@endif @endif
@ -109,13 +116,13 @@ exit(); ?>
<?php //success ?> <?php //success ?>
<div class="logo-container fadein"> <div class="logo-container fadein">
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style=""> <img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
<div class="logo-centered">l</div> <div class="logo-centered">l</div>
</div> </div>
<h1>Success!</h1> <h1>Success!</h1>
<h4 class="">The update was successful, you can now return to the Admin Panel:</h4> <h4 class="">The update was successful, you can now return to the Admin Panel:</h4>
<br><div class="row"> <br><div class="row">
&ensp;<a class="btn" href="{{ route('studioIndex') }}"><button style=""><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp; &ensp;<a class="btn" href="{{ route('studioIndex') }}"><button><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp;
</div> </div>
@endif @endif
@ -124,13 +131,13 @@ exit(); ?>
<?php //success ?> <?php //success ?>
<div class="logo-container fadein"> <div class="logo-container fadein">
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style=""> <img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
<div class="logo-centered">l</div> <div class="logo-centered">l</div>
</div> </div>
<h1>Error</h1> <h1>Error</h1>
<h4 class="">Something went wrong with the update :(</h4> <h4 class="">Something went wrong with the update :(</h4>
<br><div class="row"> <br><div class="row">
&ensp;<a class="btn" href="{{ route('studioIndex') }}"><button style=""><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp; &ensp;<a class="btn" href="{{ route('studioIndex') }}"><button><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp;
</div> </div>
@endif @endif

View File

@ -86,7 +86,7 @@ Route::get('/update', function () {return view('update', []);});
Route::get('/updating', function (\Codedge\Updater\UpdaterManager $updater) { Route::get('/updating', function (\Codedge\Updater\UpdaterManager $updater) {
// Check if new version is available // Check if new version is available
if($updater->source()->isNewVersionAvailable() and (file_exists(base_path("backups/CANUPDATE")))) { if($updater->source()->isNewVersionAvailable() and (file_exists(base_path("backups/CANUPDATE")) or env('SKIP_UPDATE_BACKUP') == true)) {
// Get the current installed version // Get the current installed version
echo $updater->source()->getVersionInstalled(); echo $updater->source()->getVersionInstalled();
@ -100,7 +100,7 @@ Route::get('/updating', function (\Codedge\Updater\UpdaterManager $updater) {
// Run the update process // Run the update process
$updater->source()->update($release); $updater->source()->update($release);
unlink(base_path("backups/CANUPDATE")); if(env('SKIP_UPDATE_BACKUP') != true) {unlink(base_path("backups/CANUPDATE"));}
echo "<meta http-equiv=\"refresh\" content=\"0; " . url()->current() . "/../update?finishing\" />"; echo "<meta http-equiv=\"refresh\" content=\"0; " . url()->current() . "/../update?finishing\" />";